diff options
| author | Jiri Kosina <jkosina@suse.cz> | 2012-05-22 09:32:31 (GMT) |
|---|---|---|
| committer | Jiri Kosina <jkosina@suse.cz> | 2012-05-22 09:32:31 (GMT) |
| commit | 56ccd186f1837dd418cd094f0e96b3196bbab9ef (patch) | |
| tree | 195cdd3973a1288eb84f51f0ec28a947b333c2c5 /drivers/hid/hid-ids.h | |
| parent | b3d07e0344ea36dd3f3a2fdbfaab883e1c5ca69e (diff) | |
| parent | d1257081aecf44455fcab8675f1d54e8b242faa1 (diff) | |
| download | linux-fsl-qoriq-56ccd186f1837dd418cd094f0e96b3196bbab9ef.tar.xz | |
Merge branch 'upstream' into for-linus
Conflicts:
drivers/hid/hid-core.c
Diffstat (limited to 'drivers/hid/hid-ids.h')
| -rw-r--r-- | drivers/hid/hid-ids.h | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/drivers/hid/hid-ids.h b/drivers/hid/hid-ids.h index e44932a..4ff9941 100644 --- a/drivers/hid/hid-ids.h +++ b/drivers/hid/hid-ids.h @@ -154,6 +154,9 @@ #define USB_DEVICE_ID_ATMEL_MULTITOUCH 0x211c #define USB_DEVICE_ID_ATMEL_MXT_DIGITIZER 0x2118 +#define USB_VENDOR_ID_AUREAL 0x0755 +#define USB_DEVICE_ID_AUREAL_W01RN 0x2626 + #define USB_VENDOR_ID_AVERMEDIA 0x07ca #define USB_DEVICE_ID_AVER_FM_MR800 0xb800 @@ -729,6 +732,7 @@ #define USB_DEVICE_ID_UCLOGIC_TABLET_WP5540U 0x0004 #define USB_DEVICE_ID_UCLOGIC_TABLET_WP8060U 0x0005 #define USB_DEVICE_ID_UCLOGIC_TABLET_WP1062 0x0064 +#define USB_DEVICE_ID_UCLOGIC_WIRELESS_TABLET_TWHL850 0x0522 #define USB_VENDOR_ID_UNITEC 0x227d #define USB_DEVICE_ID_UNITEC_USB_TOUCH_0709 0x0709 |