diff options
| author | Jeff Garzik <jgarzik@pobox.com> | 2005-10-13 21:22:27 -0400 |
|---|---|---|
| committer | Jeff Garzik <jgarzik@pobox.com> | 2005-10-13 21:22:27 -0400 |
| commit | 59aee3c2a1e69fe5062bd1facb72d6fcea3f3f8f (patch) | |
| tree | b337d73229a69e399d4e4f7128b33ce734660e35 /sound/usb/usbmixer_maps.c | |
| parent | 0d69ae5fb7eb9ba3b54cf0ba4ef5ae591f31eef7 (diff) | |
| parent | 046d20b73960b7a2474b6d5e920d54c3fd7c23fe (diff) | |
Merge branch 'master'
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 f05500b05ec0..c1264434e50a 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[] = { | |||
| 238 | .selector_map = audigy2nx_selectors, | 238 | .selector_map = audigy2nx_selectors, |
| 239 | }, | 239 | }, |
| 240 | { | 240 | { |
| 241 | /* Hercules DJ Console (Windows Edition) */ | ||
| 242 | .id = USB_ID(0x06f8, 0xb000), | ||
| 243 | .ignore_ctl_error = 1, | ||
| 244 | }, | ||
| 245 | { | ||
| 246 | /* Hercules DJ Console (Macintosh Edition) */ | ||
| 247 | .id = USB_ID(0x06f8, 0xd002), | ||
| 248 | .ignore_ctl_error = 1, | ||
| 249 | }, | ||
| 250 | { | ||
| 241 | .id = USB_ID(0x08bb, 0x2702), | 251 | .id = USB_ID(0x08bb, 0x2702), |
| 242 | .map = linex_map, | 252 | .map = linex_map, |
| 243 | .ignore_ctl_error = 1, | 253 | .ignore_ctl_error = 1, |