From 7ead0becc0b1548e1d4dce19603f8dbb7d5f8672 Mon Sep 17 00:00:00 2001 From: Clemens Ladisch Date: Wed, 5 Oct 2005 13:02:38 +0200 Subject: [PATCH] --- yaml --- r: 9756 b: refs/heads/master c: 9c9565f709f28c12dadfe74b31f2c86ffd75f71e h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/sound/usb/usbmixer_maps.c | 7 ++++++- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 5c517323e937..a6e6e4df2994 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 4d060fd16946d767ee903804c6769a26d7da7ab2 +refs/heads/master: 9c9565f709f28c12dadfe74b31f2c86ffd75f71e diff --git a/trunk/sound/usb/usbmixer_maps.c b/trunk/sound/usb/usbmixer_maps.c index 13199ff36d4c..c1264434e50a 100644 --- a/trunk/sound/usb/usbmixer_maps.c +++ b/trunk/sound/usb/usbmixer_maps.c @@ -238,7 +238,12 @@ static struct usbmix_ctl_map usbmix_ctl_maps[] = { .selector_map = audigy2nx_selectors, }, { - /* Hercules DJ Console */ + /* 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, },