diff options
| author | Takashi Iwai <tiwai@suse.de> | 2009-06-16 11:38:50 -0400 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2009-06-16 11:38:50 -0400 |
| commit | 3b13b5ce8c1b52379aff80666d31d4354354b2d4 (patch) | |
| tree | 62337622419ec669d26520e448a39a28200f1af9 /sound | |
| parent | b909005ce15886e9f3283b876e17901f8057d2f7 (diff) | |
| parent | d9e89bf0c0a25273921381df8edd41e69b74b74c (diff) | |
Merge branch 'topic/usb-audio' into for-linus
* topic/usb-audio:
ALSA: usb-audio - rework quirk for TerraTec Aureon USB 5.1 MkII
Diffstat (limited to 'sound')
| -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 | }, |