diff options
author | Takashi Iwai <tiwai@suse.de> | 2009-05-04 10:00:16 -0400 |
---|---|---|
committer | Takashi Iwai <tiwai@suse.de> | 2009-05-04 10:00:16 -0400 |
commit | 3a20ac2c52b1317f5a5f0bd9cd3cbe8495ddd026 (patch) | |
tree | 9a912f2609cefb9698b5cce09cd240bd6dbd09fb /sound/usb/usbquirks.h | |
parent | 18cc8d8d9b74c446832336d8f6e1afb145f9431b (diff) | |
parent | 3e5b50165fd0be080044586f43fcdd460ed27610 (diff) |
Merge branch 'fix/pcm-jiffies-check' into fix/asoc
Diffstat (limited to 'sound/usb/usbquirks.h')
-rw-r--r-- | sound/usb/usbquirks.h | 18 |
1 files changed, 18 insertions, 0 deletions
diff --git a/sound/usb/usbquirks.h b/sound/usb/usbquirks.h index 92115755d98e..647ef5029651 100644 --- a/sound/usb/usbquirks.h +++ b/sound/usb/usbquirks.h | |||
@@ -39,6 +39,16 @@ | |||
39 | .idProduct = prod, \ | 39 | .idProduct = prod, \ |
40 | .bInterfaceClass = USB_CLASS_VENDOR_SPEC | 40 | .bInterfaceClass = USB_CLASS_VENDOR_SPEC |
41 | 41 | ||
42 | /* Creative/Toshiba Multimedia Center SB-0500 */ | ||
43 | { | ||
44 | USB_DEVICE(0x041e, 0x3048), | ||
45 | .driver_info = (unsigned long) & (const struct snd_usb_audio_quirk) { | ||
46 | .vendor_name = "Toshiba", | ||
47 | .product_name = "SB-0500", | ||
48 | .ifnum = QUIRK_NO_INTERFACE | ||
49 | } | ||
50 | }, | ||
51 | |||
42 | /* Creative/E-Mu devices */ | 52 | /* Creative/E-Mu devices */ |
43 | { | 53 | { |
44 | USB_DEVICE(0x041e, 0x3010), | 54 | USB_DEVICE(0x041e, 0x3010), |
@@ -128,6 +138,14 @@ | |||
128 | .bInterfaceClass = USB_CLASS_AUDIO, | 138 | .bInterfaceClass = USB_CLASS_AUDIO, |
129 | .bInterfaceSubClass = USB_SUBCLASS_AUDIO_CONTROL | 139 | .bInterfaceSubClass = USB_SUBCLASS_AUDIO_CONTROL |
130 | }, | 140 | }, |
141 | { | ||
142 | USB_DEVICE(0x046d, 0x0990), | ||
143 | .driver_info = (unsigned long) & (const struct snd_usb_audio_quirk) { | ||
144 | .vendor_name = "Logitech, Inc.", | ||
145 | .product_name = "QuickCam Pro 9000", | ||
146 | .ifnum = QUIRK_NO_INTERFACE | ||
147 | } | ||
148 | }, | ||
131 | 149 | ||
132 | /* | 150 | /* |
133 | * Yamaha devices | 151 | * Yamaha devices |