summaryrefslogtreecommitdiff
path: root/rules
diff options
context:
space:
mode:
authorPeter Hutterer <peter.hutterer@who-t.net>2015-06-26 16:09:48 +1000
committerAnthony G. Basile <blueness@gentoo.org>2015-07-20 07:28:05 -0400
commita5cb5f0b4cc2a00be836b77d421fe5c3529c03de (patch)
tree8efbb46234eae47c7dc1c46023f6cc6cfc3273de /rules
parentb5ac92fb857cff9cdf6f3ddc79df63eb30824529 (diff)
Revert "hwdb: add a touchpad hwdb"
The main purpose of this hwdb was to tag touchpads that have the physical trackstick buttons wired to the touchpad (Lenovo Carbon X1 3rd, Lenovo *50 series). This hwdb is not required on kernels 4.0 and above, the kernel now re-routes button presses through the trackstick's device node. Userspace does not need to do anything. See kernel commit cdd9dc195916ef5644cfac079094c3c1d1616e4c. This reverts commit 001a247324b44c0e0b8fdba41a6fc66e7465b8b6. Signed-off-by: Anthony G. Basile <blueness@gentoo.org>
Diffstat (limited to 'rules')
-rw-r--r--rules/70-touchpad.rules12
-rw-r--r--rules/Makefile.am1
2 files changed, 0 insertions, 13 deletions
diff --git a/rules/70-touchpad.rules b/rules/70-touchpad.rules
deleted file mode 100644
index 88e6fd2f25..0000000000
--- a/rules/70-touchpad.rules
+++ /dev/null
@@ -1,12 +0,0 @@
-# do not edit this file, it will be overwritten on update
-
-ACTION=="remove", GOTO="touchpad_end"
-KERNEL!="event*", GOTO="touchpad_end"
-ENV{ID_INPUT_TOUCHPAD}=="", GOTO="touchpad_end"
-
-# touchpad:pnpid:<pnpid>:*
-KERNELS=="serio1", \
- IMPORT{builtin}="hwdb 'touchpad:pnpid:$attr{firmware_id}:'", \
- GOTO="touchpad_end"
-
-LABEL="touchpad_end"
diff --git a/rules/Makefile.am b/rules/Makefile.am
index 6be3ae488b..f266e50a28 100644
--- a/rules/Makefile.am
+++ b/rules/Makefile.am
@@ -14,7 +14,6 @@ dist_udevrules_DATA = \
61-accelerometer.rules \
64-btrfs.rules \
70-mouse.rules \
- 70-touchpad.rules \
75-net-description.rules \
75-probe_mtd.rules \
78-sound-card.rules \