Merge branch 'master' into upstream
Sync with Linus' tree so that we don't have build falures due to Quanta 3001 ID reshuffling.
This commit is contained in:
@@ -336,6 +336,7 @@
|
||||
#define USB_VENDOR_ID_GRIFFIN 0x077d
|
||||
#define USB_DEVICE_ID_POWERMATE 0x0410
|
||||
#define USB_DEVICE_ID_SOUNDKNOB 0x04AA
|
||||
#define USB_DEVICE_ID_RADIOSHARK 0x627a
|
||||
|
||||
#define USB_VENDOR_ID_GTCO 0x078c
|
||||
#define USB_DEVICE_ID_GTCO_90 0x0090
|
||||
|
Reference in New Issue
Block a user