summaryrefslogtreecommitdiffstats
path: root/sound/usb/Kconfig
diff options
context:
space:
mode:
authorDaniel Mack <daniel@caiaq.de>2010-09-10 11:04:57 +0200
committerTakashi Iwai <tiwai@suse.de>2010-09-10 11:08:39 +0200
commit15c5ab607045e278ebf4d2ca4aea2250617d50ca (patch)
tree28bc9f525aa4f3ca1158b0ced1cfe1fc62a75bef /sound/usb/Kconfig
parentALSA: snd-usb-caiaq: drop version number (diff)
downloadlinux-15c5ab607045e278ebf4d2ca4aea2250617d50ca.tar.xz
linux-15c5ab607045e278ebf4d2ca4aea2250617d50ca.zip
ALSA: snd-usb-caiaq: Add support for Traktor Kontrol S4
This patch adds support for the new Traktor Kontrol S4 by Native Instruments. It features a new audio data streaming model, MIDI in and out ports, a huge number of 174 dimmable LEDs, 96 buttons and 46 absolute encoder axis, including some rotary encoders. All features are supported by the driver now. Did some code refactoring along the way. Signed-off-by: Daniel Mack <daniel@caiaq.de> Signed-off-by: Takashi Iwai <tiwai@suse.de>
Diffstat (limited to 'sound/usb/Kconfig')
-rw-r--r--sound/usb/Kconfig2
1 files changed, 2 insertions, 0 deletions
diff --git a/sound/usb/Kconfig b/sound/usb/Kconfig
index 44d6d2ec964f..112984f4080f 100644
--- a/sound/usb/Kconfig
+++ b/sound/usb/Kconfig
@@ -65,6 +65,7 @@ config SND_USB_CAIAQ
* Native Instruments Guitar Rig Session I/O
* Native Instruments Guitar Rig mobile
* Native Instruments Traktor Kontrol X1
+ * Native Instruments Traktor Kontrol S4
To compile this driver as a module, choose M here: the module
will be called snd-usb-caiaq.
@@ -82,6 +83,7 @@ config SND_USB_CAIAQ_INPUT
* Native Instruments Kore Controller
* Native Instruments Kore Controller 2
* Native Instruments Audio Kontrol 1
+ * Native Instruments Traktor Kontrol S4
config SND_USB_US122L
tristate "Tascam US-122L USB driver"