diff options
| author | Kukjin Kim <kgene.kim@samsung.com> | 2010-08-06 08:49:18 -0400 |
|---|---|---|
| committer | Kukjin Kim <kgene.kim@samsung.com> | 2010-08-06 08:49:18 -0400 |
| commit | d61bd77ff1e7c7a0a381c6e656dbc07b37510f37 (patch) | |
| tree | 838f7b1c4d931814fbbc30643bb423f409e6daba /drivers/hid/hid-ids.h | |
| parent | f2b7e3c54a304677a1142829fb5913595885379f (diff) | |
| parent | 1c739c7f374f77c5a355273c0c1d9345ed08c0ce (diff) | |
Merge branch 'next-samsung' into for-next
Conflicts:
arch/arm/mach-s5p6440/Kconfig
arch/arm/mach-s5p6442/Kconfig
arch/arm/mach-s5pc100/Kconfig
arch/arm/mach-s5pv210/Kconfig
arch/arm/mach-s5pv210/cpu.c
arch/arm/plat-samsung/include/plat/sdhci.h
Diffstat (limited to 'drivers/hid/hid-ids.h')
| -rw-r--r-- | drivers/hid/hid-ids.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/hid/hid-ids.h b/drivers/hid/hid-ids.h index 31601eef25dd..8aee2577c1ad 100644 --- a/drivers/hid/hid-ids.h +++ b/drivers/hid/hid-ids.h | |||
| @@ -198,6 +198,7 @@ | |||
| 198 | 198 | ||
| 199 | #define USB_VENDOR_ID_ETT 0x0664 | 199 | #define USB_VENDOR_ID_ETT 0x0664 |
| 200 | #define USB_DEVICE_ID_TC5UH 0x0309 | 200 | #define USB_DEVICE_ID_TC5UH 0x0309 |
| 201 | #define USB_DEVICE_ID_TC4UM 0x0306 | ||
| 201 | 202 | ||
| 202 | #define USB_VENDOR_ID_EZKEY 0x0518 | 203 | #define USB_VENDOR_ID_EZKEY 0x0518 |
| 203 | #define USB_DEVICE_ID_BTC_8193 0x0002 | 204 | #define USB_DEVICE_ID_BTC_8193 0x0002 |