diff options
| author | Jiri Kosina <jkosina@suse.cz> | 2010-05-19 14:04:49 +0200 |
|---|---|---|
| committer | Jiri Kosina <jkosina@suse.cz> | 2010-05-19 14:04:49 +0200 |
| commit | 7426ef52b42ebd54ba85133ffd29132e008a882c (patch) | |
| tree | 5232ca850065baf025e8d7384408b48b4b462c96 /include/linux/hid.h | |
| parent | 537b60d17894b7c19a6060feae40299d7109d6e7 (diff) | |
| parent | a8ab5d58b0238b8199cc699b8dff7c5e1da24138 (diff) | |
| download | linux-7426ef52b42ebd54ba85133ffd29132e008a882c.tar.gz linux-7426ef52b42ebd54ba85133ffd29132e008a882c.tar.bz2 linux-7426ef52b42ebd54ba85133ffd29132e008a882c.zip | |
Merge branch 'upstream' into for-linus
Conflicts:
drivers/hid/hid-wacom.c
Diffstat (limited to 'include/linux/hid.h')
| -rw-r--r-- | include/linux/hid.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/include/linux/hid.h b/include/linux/hid.h index b1344ec4b7fc..f1f2b6f0d1c4 100644 --- a/include/linux/hid.h +++ b/include/linux/hid.h @@ -308,11 +308,13 @@ struct hid_item { #define HID_QUIRK_NOTOUCH 0x00000002 #define HID_QUIRK_IGNORE 0x00000004 #define HID_QUIRK_NOGET 0x00000008 +#define HID_QUIRK_HIDDEV_FORCE 0x00000010 #define HID_QUIRK_BADPAD 0x00000020 #define HID_QUIRK_MULTI_INPUT 0x00000040 #define HID_QUIRK_SKIP_OUTPUT_REPORTS 0x00010000 #define HID_QUIRK_FULLSPEED_INTERVAL 0x10000000 #define HID_QUIRK_NO_INIT_REPORTS 0x20000000 +#define HID_QUIRK_NO_IGNORE 0x40000000 /* * This is the global environment of the parser. This information is |