diff options
| author | Jiri Kosina <jkosina@suse.cz> | 2012-08-27 11:04:24 -0400 |
|---|---|---|
| committer | Jiri Kosina <jkosina@suse.cz> | 2012-08-27 11:05:17 -0400 |
| commit | 66a61fc0b2c3475f26f65b5f29ed5945b8efbf9e (patch) | |
| tree | 28ebaaee56786cd9199e0e5802d166474d30d1e3 /drivers/hid/hid-ids.h | |
| parent | 8db089d1b08209c04cd130e49fa4796b5513ce7f (diff) | |
| parent | d37e44969e60dc652fdbaf4397d5436e07c967af (diff) | |
Merge branch 'master' into upstream
Sync with Linus' tree so that we don't have build falures
due to Quanta 3001 ID reshuffling.
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 5d886b7cade9..0709c0093ac5 100644 --- a/drivers/hid/hid-ids.h +++ b/drivers/hid/hid-ids.h | |||
| @@ -336,6 +336,7 @@ | |||
| 336 | #define USB_VENDOR_ID_GRIFFIN 0x077d | 336 | #define USB_VENDOR_ID_GRIFFIN 0x077d |
| 337 | #define USB_DEVICE_ID_POWERMATE 0x0410 | 337 | #define USB_DEVICE_ID_POWERMATE 0x0410 |
| 338 | #define USB_DEVICE_ID_SOUNDKNOB 0x04AA | 338 | #define USB_DEVICE_ID_SOUNDKNOB 0x04AA |
| 339 | #define USB_DEVICE_ID_RADIOSHARK 0x627a | ||
| 339 | 340 | ||
| 340 | #define USB_VENDOR_ID_GTCO 0x078c | 341 | #define USB_VENDOR_ID_GTCO 0x078c |
| 341 | #define USB_DEVICE_ID_GTCO_90 0x0090 | 342 | #define USB_DEVICE_ID_GTCO_90 0x0090 |