diff options
| author | Peter Hutterer <peter.hutterer@who-t.net> | 2015-05-05 15:54:20 +1000 |
|---|---|---|
| committer | Peter Hutterer <peter.hutterer@who-t.net> | 2015-05-18 13:41:09 +1000 |
| commit | fc59c8fe8d941b0ec1e98c59bc57b1f97dba149d (patch) | |
| tree | c49a024cb0373f507d91b6ba8ea1f7084ba7acbd | |
| parent | bf6344e1913a5d24c2d68eaca999ea3d71e1b707 (diff) | |
Now that we have two likely drivers that fight for control over the input
devices (evdev and libinput) let's move the respective driver assignment to
each package. So you get what you install.
https://bugs.freedesktop.org/show_bug.cgi?id=89023
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Reviewed-by: Hans de Goede <hdegoede@redhat.com>
| -rw-r--r-- | config/10-evdev.conf | 40 | ||||
| -rw-r--r-- | config/Makefile.am | 4 |
2 files changed, 2 insertions, 42 deletions
diff --git a/config/10-evdev.conf b/config/10-evdev.conf deleted file mode 100644 index cc83ab232..000000000 --- a/config/10-evdev.conf +++ /dev/null @@ -1,40 +0,0 @@ -# -# Catch-all evdev loader for udev-based systems -# We don't simply match on any device since that also adds accelerometers -# and other devices that we don't really want to use. The list below -# matches everything but joysticks. - -Section "InputClass" - Identifier "evdev pointer catchall" - MatchIsPointer "on" - MatchDevicePath "/dev/input/event*" - Driver "evdev" -EndSection - -Section "InputClass" - Identifier "evdev keyboard catchall" - MatchIsKeyboard "on" - MatchDevicePath "/dev/input/event*" - Driver "evdev" -EndSection - -Section "InputClass" - Identifier "evdev touchpad catchall" - MatchIsTouchpad "on" - MatchDevicePath "/dev/input/event*" - Driver "evdev" -EndSection - -Section "InputClass" - Identifier "evdev tablet catchall" - MatchIsTablet "on" - MatchDevicePath "/dev/input/event*" - Driver "evdev" -EndSection - -Section "InputClass" - Identifier "evdev touchscreen catchall" - MatchIsTouchscreen "on" - MatchDevicePath "/dev/input/event*" - Driver "evdev" -EndSection diff --git a/config/Makefile.am b/config/Makefile.am index 0e20e8b3d..51aae473e 100644 --- a/config/Makefile.am +++ b/config/Makefile.am @@ -18,7 +18,7 @@ libconfig_la_LIBADD += $(UDEV_LIBS) if XORG xorgconfddir = $(datadir)/X11/$(XF86CONFIGDIR) -xorgconfd_DATA = 10-evdev.conf 10-quirks.conf +xorgconfd_DATA = 10-quirks.conf endif else @@ -38,4 +38,4 @@ endif # !CONFIG_HAL endif # !CONFIG_UDEV -EXTRA_DIST = x11-input.fdi 10-evdev.conf fdi2iclass.py 10-quirks.conf +EXTRA_DIST = x11-input.fdi fdi2iclass.py 10-quirks.conf |