Merge branch 'for-3.10/mt-hybrid-finger-pen' into for-linus

Conflicts: drivers/hid/hid-multitouch.c
2013-04-30 10:17:48 +02:00
parent 4f5a810429 fb4d8d98dc
commit 72c16d9a5c
3 changed files with 255 additions and 60 deletions
--- 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