diff options
| author | Jiri Kosina <jkosina@suse.cz> | 2010-08-04 09:29:35 -0400 |
|---|---|---|
| committer | Jiri Kosina <jkosina@suse.cz> | 2010-08-04 09:29:35 -0400 |
| commit | 35d03a0d9b22fdf7cba75cd41a6f0a039ba35cdd (patch) | |
| tree | 1f85aa8bd902aae76beb1c9deb20557a2e71fe9c /drivers/hid/hid-ids.h | |
| parent | 9929ffed889b4861b52ba648a44fa4add945c4d1 (diff) | |
| parent | 7d3d42a79519df4cd62c3aa5d9ae2d77ebbf8fab (diff) | |
Merge branch 'acrux' 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 | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/drivers/hid/hid-ids.h b/drivers/hid/hid-ids.h index 066d219b7f10..08b6ac6d2cc1 100644 --- a/drivers/hid/hid-ids.h +++ b/drivers/hid/hid-ids.h | |||
| @@ -34,7 +34,9 @@ | |||
| 34 | #define USB_DEVICE_ID_ACECAD_FLAIR 0x0004 | 34 | #define USB_DEVICE_ID_ACECAD_FLAIR 0x0004 |
| 35 | #define USB_DEVICE_ID_ACECAD_302 0x0008 | 35 | #define USB_DEVICE_ID_ACECAD_302 0x0008 |
| 36 | 36 | ||
| 37 | #define USB_VENDOR_ID_ADS_TECH 0x06e1 | 37 | #define USB_VENDOR_ID_ACRUX 0x1a34 |
| 38 | |||
| 39 | #define USB_VENDOR_ID_ADS_TECH 0x06e1 | ||
| 38 | #define USB_DEVICE_ID_ADS_TECH_RADIO_SI470X 0xa155 | 40 | #define USB_DEVICE_ID_ADS_TECH_RADIO_SI470X 0xa155 |
| 39 | 41 | ||
| 40 | #define USB_VENDOR_ID_AFATECH 0x15a4 | 42 | #define USB_VENDOR_ID_AFATECH 0x15a4 |