diff options
author | Takashi Iwai <tiwai@suse.de> | 2009-01-15 10:22:33 -0500 |
---|---|---|
committer | Takashi Iwai <tiwai@suse.de> | 2009-01-15 10:22:33 -0500 |
commit | 40f135f0660e9edec4beeb0ef142dd218e559d99 (patch) | |
tree | 11286518600013f59e61b144fda725dc0e12d517 /sound | |
parent | e8d7bd34a5cd850329b4908efe6f3ae73bc5fd1a (diff) | |
parent | 5c6c9e6feccf771d060708fbbba9e0f67f8e0e67 (diff) |
Merge branch 'topic/usb-fix' into for-linus
Diffstat (limited to 'sound')
-rw-r--r-- | sound/usb/usbquirks.h | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/sound/usb/usbquirks.h b/sound/usb/usbquirks.h index 92115755d98e..5d8ef09b9dcc 100644 --- a/sound/usb/usbquirks.h +++ b/sound/usb/usbquirks.h | |||
@@ -128,6 +128,14 @@ | |||
128 | .bInterfaceClass = USB_CLASS_AUDIO, | 128 | .bInterfaceClass = USB_CLASS_AUDIO, |
129 | .bInterfaceSubClass = USB_SUBCLASS_AUDIO_CONTROL | 129 | .bInterfaceSubClass = USB_SUBCLASS_AUDIO_CONTROL |
130 | }, | 130 | }, |
131 | { | ||
132 | USB_DEVICE(0x046d, 0x0990), | ||
133 | .driver_info = (unsigned long) & (const struct snd_usb_audio_quirk) { | ||
134 | .vendor_name = "Logitech, Inc.", | ||
135 | .product_name = "QuickCam Pro 9000", | ||
136 | .ifnum = QUIRK_NO_INTERFACE | ||
137 | } | ||
138 | }, | ||
131 | 139 | ||
132 | /* | 140 | /* |
133 | * Yamaha devices | 141 | * Yamaha devices |