diff options
| author | Jiri Kosina <jkosina@suse.cz> | 2010-05-19 08:26:44 -0400 |
|---|---|---|
| committer | Jiri Kosina <jkosina@suse.cz> | 2010-05-19 08:26:44 -0400 |
| commit | 77933c354c6c0e4b6abcb417518e84b8fd9b7ae4 (patch) | |
| tree | f05d0a426959ee01ce74c1f4733076d3b0ee4c8d /drivers/hid/hid-ids.h | |
| parent | 896ebc0935a1280b6f0d56c0cd9e2ec01fdebc68 (diff) | |
| parent | c872b0fccc6e086beea0a7b3b4123b7d0e75a868 (diff) | |
Merge branch 'egalax' into for-linus
Conflicts:
drivers/hid/hid-ids.h
Diffstat (limited to 'drivers/hid/hid-ids.h')
| -rw-r--r-- | drivers/hid/hid-ids.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/hid/hid-ids.h b/drivers/hid/hid-ids.h index 7f4b94fbd7ce..16c2f866821a 100644 --- a/drivers/hid/hid-ids.h +++ b/drivers/hid/hid-ids.h | |||
| @@ -179,8 +179,9 @@ | |||
| 179 | 179 | ||
| 180 | #define USB_VENDOR_ID_DRAGONRISE 0x0079 | 180 | #define USB_VENDOR_ID_DRAGONRISE 0x0079 |
| 181 | 181 | ||
| 182 | #define USB_VENDOR_ID_EGALAX 0x0EEF | 182 | #define USB_VENDOR_ID_DWAV 0x0eef |
| 183 | #define USB_DEVICE_ID_EGALAX_TOUCHCONTROLLER 0x0001 | 183 | #define USB_DEVICE_ID_EGALAX_TOUCHCONTROLLER 0x0001 |
| 184 | #define USB_DEVICE_ID_DWAV_EGALAX_MULTITOUCH 0x480d | ||
| 184 | 185 | ||
| 185 | #define USB_VENDOR_ID_ELO 0x04E7 | 186 | #define USB_VENDOR_ID_ELO 0x04E7 |
| 186 | #define USB_DEVICE_ID_ELO_TS2700 0x0020 | 187 | #define USB_DEVICE_ID_ELO_TS2700 0x0020 |