diff options
author | Takashi Iwai <tiwai@suse.de> | 2009-12-04 16:22:37 +0100 |
---|---|---|
committer | Takashi Iwai <tiwai@suse.de> | 2009-12-04 16:22:37 +0100 |
commit | 57648cd52b1848c6885bdbd948d113d52f3ddd43 (patch) | |
tree | 218c74fde12577ea22f51eabcf4e8b65273edb54 /sound/usb/usbquirks.h | |
parent | 79598324838a25cc378ecbb8c29dd1e3d3951d35 (diff) | |
parent | fb716c0b7bed36064cd41d800c8f339f41adf084 (diff) | |
download | kernel_samsung_aries-57648cd52b1848c6885bdbd948d113d52f3ddd43.zip kernel_samsung_aries-57648cd52b1848c6885bdbd948d113d52f3ddd43.tar.gz kernel_samsung_aries-57648cd52b1848c6885bdbd948d113d52f3ddd43.tar.bz2 |
Merge branch 'topic/misc' into for-linus
Diffstat (limited to 'sound/usb/usbquirks.h')
-rw-r--r-- | sound/usb/usbquirks.h | 23 |
1 files changed, 23 insertions, 0 deletions
diff --git a/sound/usb/usbquirks.h b/sound/usb/usbquirks.h index f6f201e..a892bda 100644 --- a/sound/usb/usbquirks.h +++ b/sound/usb/usbquirks.h @@ -1563,6 +1563,29 @@ YAMAHA_DEVICE(0x7010, "UB99"), } } }, +{ + /* has ID 0x00ea when not in Advanced Driver mode */ + USB_DEVICE_VENDOR_SPEC(0x0582, 0x00e9), + .driver_info = (unsigned long) & (const struct snd_usb_audio_quirk) { + /* .vendor_name = "Roland", */ + /* .product_name = "UA-1G", */ + .ifnum = QUIRK_ANY_INTERFACE, + .type = QUIRK_COMPOSITE, + .data = (const struct snd_usb_audio_quirk[]) { + { + .ifnum = 0, + .type = QUIRK_AUDIO_STANDARD_INTERFACE + }, + { + .ifnum = 1, + .type = QUIRK_AUDIO_STANDARD_INTERFACE + }, + { + .ifnum = -1 + } + } + } +}, /* Guillemot devices */ { |