summaryrefslogtreecommitdiffstats
path: root/include
diff options
context:
space:
mode:
authorHenrik Rydberg <rydberg@euromail.se>2012-05-01 08:40:01 +0200
committerJiri Kosina <jkosina@suse.cz>2012-05-01 12:54:55 +0200
commit4fa3a5837b8427faab9b064b1948795eb77b9f8d (patch)
tree4aaa5fffb375f0b44e5c0a44726948ac016f53bf /include
parent070748ed0b52399858a5967026a452bbb903a64c (diff)
downloadtalos-op-linux-4fa3a5837b8427faab9b064b1948795eb77b9f8d.tar.gz
talos-op-linux-4fa3a5837b8427faab9b064b1948795eb77b9f8d.zip
HID: hid-multitouch: Switch to device groups
Switch the driver over to device group handling. By adding the HID_GROUP_MULTITOUCH group to hid-core, hid-generic will no longer match multitouch devices. By adding the HID_GROUP_MULTITOUCH entry to the device list, hid-multitouch will match all unknown multitouch devices, and udev will automatically load the module. Since HID_QUIRK_MULTITOUCH never gets set, the special quirks handling can be removed. Since all HID MT devices have HID_DG_CONTACTID, they can be removed from the hid_have_special_driver list. With this patch, the unknown device ids are no longer NULL, so the code is modified to check for the generic entry instead. Signed-off-by: Henrik Rydberg <rydberg@euromail.se> Acked-by: Benjamin Tissoires <benjamin.tissoires@gmail.com> Signed-off-by: Jiri Kosina <jkosina@suse.cz>
Diffstat (limited to 'include')
-rw-r--r--include/linux/hid.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/include/linux/hid.h b/include/linux/hid.h
index dd694fb0c284..2c7a19515c3a 100644
--- a/include/linux/hid.h
+++ b/include/linux/hid.h
@@ -317,7 +317,6 @@ struct hid_item {
#define HID_QUIRK_BADPAD 0x00000020
#define HID_QUIRK_MULTI_INPUT 0x00000040
#define HID_QUIRK_HIDINPUT_FORCE 0x00000080
-#define HID_QUIRK_MULTITOUCH 0x00000100
#define HID_QUIRK_SKIP_OUTPUT_REPORTS 0x00010000
#define HID_QUIRK_FULLSPEED_INTERVAL 0x10000000
#define HID_QUIRK_NO_INIT_REPORTS 0x20000000
@@ -328,6 +327,7 @@ struct hid_item {
* HID device groups
*/
#define HID_GROUP_GENERIC 0x0001
+#define HID_GROUP_MULTITOUCH 0x0002
/*
* This is the global environment of the parser. This information is
OpenPOWER on IntegriCloud