diff options
| author | Takashi Iwai <tiwai@suse.de> | 2011-05-22 04:01:29 -0400 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2011-05-22 04:01:29 -0400 |
| commit | 02e5fbf622aabf68bdc02282a17a3aeed054237a (patch) | |
| tree | 60f2d4e09464dbf338c832bb39f861f29779b86b /sound/usb/quirks.c | |
| parent | b759b3ac9aee3afb01c21b603970ebb200c8048e (diff) | |
| parent | bfe9fc8aebc997ce8bcf8ac0586c84a247812064 (diff) | |
Merge branch 'topic/misc' into for-linus
Diffstat (limited to 'sound/usb/quirks.c')
| -rw-r--r-- | sound/usb/quirks.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/sound/usb/quirks.c b/sound/usb/quirks.c index 1b94ec3a3368..bd13d7257240 100644 --- a/sound/usb/quirks.c +++ b/sound/usb/quirks.c | |||
| @@ -540,6 +540,7 @@ int snd_usb_apply_boot_quirk(struct usb_device *dev, | |||
| 540 | /* Access Music VirusTI Desktop */ | 540 | /* Access Music VirusTI Desktop */ |
| 541 | return snd_usb_accessmusic_boot_quirk(dev); | 541 | return snd_usb_accessmusic_boot_quirk(dev); |
| 542 | 542 | ||
| 543 | case USB_ID(0x17cc, 0x1000): /* Komplete Audio 6 */ | ||
| 543 | case USB_ID(0x17cc, 0x1010): /* Traktor Audio 6 */ | 544 | case USB_ID(0x17cc, 0x1010): /* Traktor Audio 6 */ |
| 544 | case USB_ID(0x17cc, 0x1020): /* Traktor Audio 10 */ | 545 | case USB_ID(0x17cc, 0x1020): /* Traktor Audio 10 */ |
| 545 | return snd_usb_nativeinstruments_boot_quirk(dev); | 546 | return snd_usb_nativeinstruments_boot_quirk(dev); |