summaryrefslogtreecommitdiffstats
path: root/sound/usb/usbmixer_maps.c
diff options
context:
space:
mode:
authorAndrea Borgia <andrea@borgia.bo.it>2009-01-07 22:58:50 +0100
committerTakashi Iwai <tiwai@suse.de>2009-01-07 23:32:04 +0100
commit3195954da9cdb1cadb2059921c62e69d376c624f (patch)
tree924caf1621775a1bf7864eb1bd33e6ac22cb0772 /sound/usb/usbmixer_maps.c
parent913ae5a24efd27deef4fc154953871b62d0d99cd (diff)
ALSA: preliminary support for Toshiba SB-0500
The Toshiba Multimedia Center SB-0500 is a rebranded version of the Creative Technology SB Live! 24-bit External: it shares the same chipset and only has minor cosmetic differences. Remote controller works with alsa_usb module, basic audio is there and mixer controls are mostly untested. Signed-off-by: Andrea Borgia <andrea@borgia.bo.it> Signed-off-by: Takashi Iwai <tiwai@suse.de>
Diffstat (limited to 'sound/usb/usbmixer_maps.c')
-rw-r--r--sound/usb/usbmixer_maps.c5
1 files changed, 5 insertions, 0 deletions
diff --git a/sound/usb/usbmixer_maps.c b/sound/usb/usbmixer_maps.c
index d755be0ad81..f41214f3ad6 100644
--- a/sound/usb/usbmixer_maps.c
+++ b/sound/usb/usbmixer_maps.c
@@ -285,6 +285,11 @@ static struct usbmix_ctl_map usbmix_ctl_maps[] = {
.map = live24ext_map,
},
{
+ .id = USB_ID(0x041e, 0x3048),
+ .map = audigy2nx_map,
+ .selector_map = audigy2nx_selectors,
+ },
+ {
/* Hercules DJ Console (Windows Edition) */
.id = USB_ID(0x06f8, 0xb000),
.ignore_ctl_error = 1,