diff options
| -rw-r--r-- | man/evdev.man | 11 | ||||
| -rw-r--r-- | src/evdev.c | 4 |
2 files changed, 2 insertions, 13 deletions
diff --git a/man/evdev.man b/man/evdev.man index 98268c8..ddf066f 100644 --- a/man/evdev.man +++ b/man/evdev.man @@ -9,7 +9,6 @@ evdev \- Generic Linux input driver .BI " Identifier \*q" devname \*q .B " Driver \*qevdev\*q" .BI " Option \*qDevice\*q \*q" devpath \*q -.BI " Option \*qPath\*q \*q" path \*q .BI " Option \*qEmulate3Buttons\*q \*q" True \*q .BI " Option \*qEmulate3Timeout\*q \*q" 50 \*q \ \ ... @@ -47,15 +46,7 @@ are supported: .BI "Option \*qDevice\*q \*q" string \*q Specifies the device through which the device can be accessed. This will generally be of the form \*q/dev/input/eventX\*q, where X is some integer. -The mapping from device node to hardware is system-dependent. This option is -mandatory unless \*qPath\*q is given, and there is no default setting. -.TP 7 -.BI "Option \*qPath\*q \*q" string \*q -Specifies the device through which the device can be accessed. This will -generally be of the form \*q/dev/input/by-path/xyz\*q, where xyz includes the -name of the device. The mapping from device node to hardware is -system-dependent. This option has precedence over the \*qDevice\*q option but -one of \*qPath\*q or \*qDevice\*q must be given. +The mapping from device node to hardware is system-dependent. .TP 7 .BI "Option \*qEmulate3Buttons\*q \*q" boolean \*q Enable/disable the emulation of the third (middle) mouse button for mice diff --git a/src/evdev.c b/src/evdev.c index 054dbe2..d6848ff 100644 --- a/src/evdev.c +++ b/src/evdev.c @@ -1331,9 +1331,7 @@ EvdevPreInit(InputDriverPtr drv, IDevPtr dev, int flags) */ pEvdev->tool = 1; - device = xf86CheckStrOption(dev->commonOptions, "Path", NULL); - if (!device) - device = xf86CheckStrOption(dev->commonOptions, "Device", NULL); + device = xf86CheckStrOption(dev->commonOptions, "Device", NULL); if (!device) { xf86Msg(X_ERROR, "%s: No device specified.\n", pInfo->name); xf86DeleteInput(pInfo, 0); |