diff options
| author | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2011-01-07 01:34:59 -0500 |
|---|---|---|
| committer | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2011-01-07 01:34:59 -0500 |
| commit | 554738da71004d96e06fb75f4772dfc3b0f47810 (patch) | |
| tree | 149a96ce3727025d3b9260961ec94ba8306db278 /drivers/hid/hid-ids.h | |
| parent | 7b4b30689d688d9ca2e5c3859db6bbe1c35e6014 (diff) | |
| parent | a6d38f889750ed6290728a19d9dad577b147c6d0 (diff) | |
Merge branch 'next' into for-linus
Conflicts:
include/linux/input.h
Diffstat (limited to 'drivers/hid/hid-ids.h')
| -rw-r--r-- | drivers/hid/hid-ids.h | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/drivers/hid/hid-ids.h b/drivers/hid/hid-ids.h index 3341baa86a30..0f150c72da7b 100644 --- a/drivers/hid/hid-ids.h +++ b/drivers/hid/hid-ids.h | |||
| @@ -196,6 +196,9 @@ | |||
| 196 | #define USB_DEVICE_ID_EGALAX_TOUCHCONTROLLER 0x0001 | 196 | #define USB_DEVICE_ID_EGALAX_TOUCHCONTROLLER 0x0001 |
| 197 | #define USB_DEVICE_ID_DWAV_EGALAX_MULTITOUCH 0x480d | 197 | #define USB_DEVICE_ID_DWAV_EGALAX_MULTITOUCH 0x480d |
| 198 | #define USB_DEVICE_ID_DWAV_EGALAX_MULTITOUCH1 0x720c | 198 | #define USB_DEVICE_ID_DWAV_EGALAX_MULTITOUCH1 0x720c |
| 199 | #define USB_DEVICE_ID_DWAV_EGALAX_MULTITOUCH2 0x72a1 | ||
| 200 | #define USB_DEVICE_ID_DWAV_EGALAX_MULTITOUCH3 0x480e | ||
| 201 | #define USB_DEVICE_ID_DWAV_EGALAX_MULTITOUCH4 0x726b | ||
| 199 | 202 | ||
| 200 | #define USB_VENDOR_ID_ELECOM 0x056e | 203 | #define USB_VENDOR_ID_ELECOM 0x056e |
| 201 | #define USB_DEVICE_ID_ELECOM_BM084 0x0061 | 204 | #define USB_DEVICE_ID_ELECOM_BM084 0x0061 |