diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2009-06-16 15:10:31 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-06-16 15:10:31 -0400 |
| commit | 661adc423d70203a56723701aaf255e16950dfdb (patch) | |
| tree | 72a62c9016667cba8a63ab3f038c69df3692a085 /sound/usb | |
| parent | 15bdb5652689d51cc0316de61774d2732472d9e1 (diff) | |
| parent | 3b13b5ce8c1b52379aff80666d31d4354354b2d4 (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: ctxfi - Fix deadlock with xfi-timer
ALSA: intel8x0 - Fix PCM position craziness
ALSA: usb-audio - rework quirk for TerraTec Aureon USB 5.1 MkII
ASoC: magician: fix PXA SSP clock polarity
ASoC: Instantiate any forgotten DAPM widgets
ASoC: Revert duplicated code in SSM2602 driver
ALSA: hda - Add quirk for Acer Aspire 6935G
ALSA: ctxfi - Replace atc lock to mutex
ASoC: Remove odd bit clock ratios for WM8903
Diffstat (limited to 'sound/usb')
| -rw-r--r-- | sound/usb/usbquirks.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sound/usb/usbquirks.h b/sound/usb/usbquirks.h index f0f7624f9178..f6f201eb24ce 100644 --- a/sound/usb/usbquirks.h +++ b/sound/usb/usbquirks.h | |||
| @@ -1989,7 +1989,7 @@ YAMAHA_DEVICE(0x7010, "UB99"), | |||
| 1989 | USB_DEVICE(0x0ccd, 0x0028), | 1989 | USB_DEVICE(0x0ccd, 0x0028), |
| 1990 | .driver_info = (unsigned long) & (const struct snd_usb_audio_quirk) { | 1990 | .driver_info = (unsigned long) & (const struct snd_usb_audio_quirk) { |
| 1991 | .vendor_name = "TerraTec", | 1991 | .vendor_name = "TerraTec", |
| 1992 | .product_name = "Aureon 5.1 MkII", | 1992 | .product_name = "Aureon5.1MkII", |
| 1993 | .ifnum = QUIRK_NO_INTERFACE | 1993 | .ifnum = QUIRK_NO_INTERFACE |
| 1994 | } | 1994 | } |
| 1995 | }, | 1995 | }, |