aboutsummaryrefslogtreecommitdiff
path: root/include/linux
diff options
context:
space:
mode:
authorJiri Kosina <jkosina@suse.cz>2013-04-30 10:17:48 +0200
committerJiri Kosina <jkosina@suse.cz>2013-04-30 10:17:48 +0200
commit72c16d9a5c303dce928a52a8861fe7a2a25f849a (patch)
treeb38d03007abcfadf12619d422169a6d4d4000ce7 /include/linux
parent4f5a81042909fed6977881f22c024aa3582cfcca (diff)
parentfb4d8d98dc24f66f7f98e6506fad63e1c320cd82 (diff)
downloadlinux-72c16d9a5c303dce928a52a8861fe7a2a25f849a.tar.gz
Merge branch 'for-3.10/mt-hybrid-finger-pen' into for-linus
Conflicts: drivers/hid/hid-multitouch.c
Diffstat (limited to 'include/linux')
-rw-r--r--include/linux/hid.h1
1 files changed, 1 insertions, 0 deletions
diff --git a/include/linux/hid.h b/include/linux/hid.h
index 31e7cb51b17..af1b86d46f6 100644
--- a/include/linux/hid.h
+++ b/include/linux/hid.h
@@ -282,6 +282,7 @@ struct hid_item {
#define HID_QUIRK_BADPAD 0x00000020
#define HID_QUIRK_MULTI_INPUT 0x00000040
#define HID_QUIRK_HIDINPUT_FORCE 0x00000080
+#define HID_QUIRK_NO_EMPTY_INPUT 0x00000100
#define HID_QUIRK_SKIP_OUTPUT_REPORTS 0x00010000
#define HID_QUIRK_FULLSPEED_INTERVAL 0x10000000
#define HID_QUIRK_NO_INIT_REPORTS 0x20000000