diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2011-05-02 12:07:27 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2011-05-02 12:07:27 -0400 |
| commit | c7bcecbe98fe29e87ac7d01c70c5998806e0989f (patch) | |
| tree | fa3c2d92ed0303adfb7eb2a8b82f2d22fea3aaf0 /sound/usb/quirks.c | |
| parent | 96f3ee280549ebf62818ef71603061a3b3230eb9 (diff) | |
| parent | 24af2b1cc418d6791b1d9e56bf6070cccb752db3 (diff) | |
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound-2.6
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound-2.6:
ALSA: hda - Fix Realtek's chained fixup checks
Revert "ALSA: hda - Fix pin-config of Gigabyte mobo"
ALSA: HDA: Fix automute for Gateway NV79
ALSA: hda: add beep quirk for Realtek 0x1043:831a
ALSA: usb-audio - Terratec Aureon 7.1 USB ID as C-Media cm6206 quirks
ALSA: hda - VIA: Fix notify_aa_path_ctls() invalid issue.
ALSA - au88x0 - Add buffer bytes constraints
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 ec07e62e53f3..1b94ec3a3368 100644 --- a/sound/usb/quirks.c +++ b/sound/usb/quirks.c | |||
| @@ -533,6 +533,7 @@ int snd_usb_apply_boot_quirk(struct usb_device *dev, | |||
| 533 | 533 | ||
| 534 | case USB_ID(0x0d8c, 0x0102): | 534 | case USB_ID(0x0d8c, 0x0102): |
| 535 | /* C-Media CM6206 / CM106-Like Sound Device */ | 535 | /* C-Media CM6206 / CM106-Like Sound Device */ |
| 536 | case USB_ID(0x0ccd, 0x00b1): /* Terratec Aureon 7.1 USB */ | ||
| 536 | return snd_usb_cm6206_boot_quirk(dev); | 537 | return snd_usb_cm6206_boot_quirk(dev); |
| 537 | 538 | ||
| 538 | case USB_ID(0x133e, 0x0815): | 539 | case USB_ID(0x133e, 0x0815): |