X-Git-Url: http://git.rot13.org/?a=blobdiff_plain;ds=sidebyside;f=sound%2Fusb%2Fusbmixer_maps.c;h=c1264434e50ac0f2134d8f56f4235c999c7898ba;hb=c6c88bbde4d8b2ffe9886b7130b2e23781d424e5;hp=f05500b05ec0a70c0dbc84306dbf44e18094723d;hpb=4e93d3e8859c834ee18dfd33051d24df8669d0c0;p=powerpc.git diff --git a/sound/usb/usbmixer_maps.c b/sound/usb/usbmixer_maps.c index f05500b05e..c1264434e5 100644 --- 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, }, + { + /* 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,