diff options
| author | Jiri Kosina <jkosina@suse.cz> | 2008-07-23 15:26:10 +0200 |
|---|---|---|
| committer | Jiri Kosina <jkosina@suse.cz> | 2008-07-23 15:26:10 +0200 |
| commit | b22d8370061898f3029cdc2601fbdec493443f03 (patch) | |
| tree | dae4b3859c5cf3ad0e2430ad7c11a1e8766f9b49 /include | |
| parent | 00b33277fa544676250d898fccea0a0255608e7f (diff) | |
| parent | 6a250778c79d6d14db9ed8e1f86f7b934e2bf3dc (diff) | |
Merge branches 'upstream' and 'upstream-fixes' into for-linus
Diffstat (limited to 'include')
| -rw-r--r-- | include/linux/hid.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/linux/hid.h b/include/linux/hid.h index fe56b86f2c6..ac4e678a04e 100644 --- a/include/linux/hid.h +++ b/include/linux/hid.h @@ -512,7 +512,7 @@ struct hid_descriptor { /* Applications from HID Usage Tables 4/8/99 Version 1.1 */ /* We ignore a few input applications that are not widely used */ -#define IS_INPUT_APPLICATION(a) (((a >= 0x00010000) && (a <= 0x00010008)) || (a == 0x00010080) || (a == 0x000c0001)) +#define IS_INPUT_APPLICATION(a) (((a >= 0x00010000) && (a <= 0x00010008)) || (a == 0x00010080) || (a == 0x000c0001) || (a == 0x000d0002)) /* HID core API */ |