diff options
author | Takashi Iwai <tiwai@suse.de> | 2009-12-21 05:21:15 -0500 |
---|---|---|
committer | Takashi Iwai <tiwai@suse.de> | 2009-12-21 05:21:15 -0500 |
commit | de8853bc38ceab1fa7e7f723b21430d4aad60fea (patch) | |
tree | 5084ef51866fd1767324f8dc8eb36e97c55350f5 /sound/usb/usbquirks.h | |
parent | f5de24b06aa46427500d0fdbe8616b73a71d8c28 (diff) | |
parent | 440b004cf953bec2bc8cd91c64ae707fd7e25327 (diff) |
Merge remote branch 'alsa/fixes' into fix/hda
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 f6f201eb24ce..a892bda03df9 100644 --- a/sound/usb/usbquirks.h +++ b/sound/usb/usbquirks.h | |||
@@ -1563,6 +1563,29 @@ YAMAHA_DEVICE(0x7010, "UB99"), | |||
1563 | } | 1563 | } |
1564 | } | 1564 | } |
1565 | }, | 1565 | }, |
1566 | { | ||
1567 | /* has ID 0x00ea when not in Advanced Driver mode */ | ||
1568 | USB_DEVICE_VENDOR_SPEC(0x0582, 0x00e9), | ||
1569 | .driver_info = (unsigned long) & (const struct snd_usb_audio_quirk) { | ||
1570 | /* .vendor_name = "Roland", */ | ||
1571 | /* .product_name = "UA-1G", */ | ||
1572 | .ifnum = QUIRK_ANY_INTERFACE, | ||
1573 | .type = QUIRK_COMPOSITE, | ||
1574 | .data = (const struct snd_usb_audio_quirk[]) { | ||
1575 | { | ||
1576 | .ifnum = 0, | ||
1577 | .type = QUIRK_AUDIO_STANDARD_INTERFACE | ||
1578 | }, | ||
1579 | { | ||
1580 | .ifnum = 1, | ||
1581 | .type = QUIRK_AUDIO_STANDARD_INTERFACE | ||
1582 | }, | ||
1583 | { | ||
1584 | .ifnum = -1 | ||
1585 | } | ||
1586 | } | ||
1587 | } | ||
1588 | }, | ||
1566 | 1589 | ||
1567 | /* Guillemot devices */ | 1590 | /* Guillemot devices */ |
1568 | { | 1591 | { |