Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/djbw/async_tx

[karo-tx-linux.git] / sound / usb / quirks-table.h

diff --git a/sound/usb/quirks-table.h b/sound/usb/quirks-table.h
index 921a86fd9884d0355ac9a4bb8c13b252c32deb31..c0dcfca9b5b55ed0b2e8737bf33823b915aae690 100644 (file)
--- a/sound/usb/quirks-table.h
+++ b/sound/usb/quirks-table.h
@@ -2290,6 +2290,20 @@ YAMAHA_DEVICE(0x7010, "UB99"),
        }
 },
 
+/* Native Instruments MK2 series */
+{
+       /* Traktor Audio 6 */
+       .match_flags = USB_DEVICE_ID_MATCH_DEVICE,
+       .idVendor = 0x17cc,
+       .idProduct = 0x1010,
+},
+{
+       /* Traktor Audio 10 */
+       .match_flags = USB_DEVICE_ID_MATCH_DEVICE,
+       .idVendor = 0x17cc,
+       .idProduct = 0x1020,
+},
+
 /* Miditech devices */
 {
        USB_DEVICE(0x4752, 0x0011),