projects
/
powerpc.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb-2.6
[powerpc.git]
/
sound
/
usb
/
usbmixer_maps.c
diff --git
a/sound/usb/usbmixer_maps.c
b/sound/usb/usbmixer_maps.c
index
f05500b
..
c126443
100644
(file)
--- a/
sound/usb/usbmixer_maps.c
+++ b/
sound/usb/usbmixer_maps.c
@@
-237,6
+237,16
@@
static struct usbmix_ctl_map usbmix_ctl_maps[] = {
.map = audigy2nx_map,
.selector_map = audigy2nx_selectors,
},
.map = audigy2nx_map,
.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,
{
.id = USB_ID(0x08bb, 0x2702),
.map = linex_map,