aboutsummaryrefslogtreecommitdiffstats
path: root/sound/usb/usbquirks.h
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@woody.linux-foundation.org>2007-05-17 00:21:33 -0400
committerLinus Torvalds <torvalds@woody.linux-foundation.org>2007-05-17 00:21:33 -0400
commitb17bfca5f16a6090ee51250163e1720f6fe71515 (patch)
treeb5c561e1c2b7db6ded4c2092486f66f7c8c35902 /sound/usb/usbquirks.h
parent36dbe4d6bffb90fcb2663ac50af00a942412e246 (diff)
parenta04395ead6d17c83da64264b6fe78f852a648202 (diff)
Merge branch 'linus' of master.kernel.org:/pub/scm/linux/kernel/git/perex/alsa
* 'linus' of master.kernel.org:/pub/scm/linux/kernel/git/perex/alsa: [ALSA] usbaudio - Coping with short replies in usbmixer [ALSA] Include quirks from Ubuntu Dapper/Edgy/Feisty [ALSA] Fix probe of non-PnP ISA devices [ALSA] version 1.0.14rc4 [ALSA] hda-codec - Fix ALC882/861VD codec support on some laptops [ALSA] ASoC AC97 device reg bugfix [ALSA] ASoC AC97 static GPL symbol fix [ALSA] hda-codec - Make the mixer capability check more robust [ALSA] usb-audio: another Logitech QuickCam ID
Diffstat (limited to 'sound/usb/usbquirks.h')
-rw-r--r--sound/usb/usbquirks.h9
1 files changed, 9 insertions, 0 deletions
diff --git a/sound/usb/usbquirks.h b/sound/usb/usbquirks.h
index 8fcbe93b2589..374fbf657a2d 100644
--- a/sound/usb/usbquirks.h
+++ b/sound/usb/usbquirks.h
@@ -48,6 +48,15 @@
48 USB_DEVICE_ID_MATCH_INT_CLASS | 48 USB_DEVICE_ID_MATCH_INT_CLASS |
49 USB_DEVICE_ID_MATCH_INT_SUBCLASS, 49 USB_DEVICE_ID_MATCH_INT_SUBCLASS,
50 .idVendor = 0x046d, 50 .idVendor = 0x046d,
51 .idProduct = 0x0850,
52 .bInterfaceClass = USB_CLASS_AUDIO,
53 .bInterfaceSubClass = USB_SUBCLASS_AUDIO_CONTROL
54},
55{
56 .match_flags = USB_DEVICE_ID_MATCH_DEVICE |
57 USB_DEVICE_ID_MATCH_INT_CLASS |
58 USB_DEVICE_ID_MATCH_INT_SUBCLASS,
59 .idVendor = 0x046d,
51 .idProduct = 0x08f0, 60 .idProduct = 0x08f0,
52 .bInterfaceClass = USB_CLASS_AUDIO, 61 .bInterfaceClass = USB_CLASS_AUDIO,
53 .bInterfaceSubClass = USB_SUBCLASS_AUDIO_CONTROL 62 .bInterfaceSubClass = USB_SUBCLASS_AUDIO_CONTROL