diff options
| author | Jiri Kosina <jkosina@suse.cz> | 2013-04-30 12:17:48 +0400 |
|---|---|---|
| committer | Jiri Kosina <jkosina@suse.cz> | 2013-04-30 12:17:48 +0400 |
| commit | 72c16d9a5c303dce928a52a8861fe7a2a25f849a (patch) | |
| tree | b38d03007abcfadf12619d422169a6d4d4000ce7 /include/linux/hid.h | |
| parent | 4f5a81042909fed6977881f22c024aa3582cfcca (diff) | |
| parent | fb4d8d98dc24f66f7f98e6506fad63e1c320cd82 (diff) | |
| download | linux-72c16d9a5c303dce928a52a8861fe7a2a25f849a.tar.xz | |
Merge branch 'for-3.10/mt-hybrid-finger-pen' into for-linus
Conflicts:
drivers/hid/hid-multitouch.c
Diffstat (limited to 'include/linux/hid.h')
| -rw-r--r-- | include/linux/hid.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/include/linux/hid.h b/include/linux/hid.h index 31e7cb51b17d..af1b86d46f6e 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 |