diff options
author | Linus Torvalds <torvalds@g5.osdl.org> | 2005-10-08 14:59:13 -0700 |
---|---|---|
committer | Linus Torvalds <torvalds@g5.osdl.org> | 2005-10-08 14:59:13 -0700 |
commit | 8aa19ad84c38cd50bfc0560646efe1c9ca83d925 (patch) | |
tree | 46eb8d8ea64620d989cabfe89c4f1d2dbba45b63 /sound/usb/usbmixer_maps.c | |
parent | 58a2c3221e3c78ea6c71148eb84d4170358981fb (diff) | |
parent | a25f175c2f6962c38cdbacfc4b66b297f4fb54b2 (diff) |
Merge master.kernel.org:/pub/scm/linux/kernel/git/perex/alsa
Diffstat (limited to 'sound/usb/usbmixer_maps.c')
-rw-r--r-- | sound/usb/usbmixer_maps.c | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/sound/usb/usbmixer_maps.c b/sound/usb/usbmixer_maps.c index f05500b05ec..c1264434e50 100644 --- a/sound/usb/usbmixer_maps.c +++ b/sound/usb/usbmixer_maps.c @@ -238,6 +238,16 @@ static struct usbmix_ctl_map usbmix_ctl_maps[] = { .selector_map = audigy2nx_selectors, }, { + /* Hercules DJ Console (Windows Edition) */ + .id = USB_ID(0x06f8, 0xb000), + .ignore_ctl_error = 1, + }, + { + /* Hercules DJ Console (Macintosh Edition) */ + .id = USB_ID(0x06f8, 0xd002), + .ignore_ctl_error = 1, + }, + { .id = USB_ID(0x08bb, 0x2702), .map = linex_map, .ignore_ctl_error = 1, |