summaryrefslogtreecommitdiffstats
path: root/sound/usb/Kconfig
diff options
context:
space:
mode:
authorWilliam Light <wrl@illest.net>2011-10-10 15:54:23 +0000
committerTakashi Iwai <tiwai@suse.de>2011-10-13 08:16:46 +0200
commite653510a27e63b41a5bae3c46eb093375e17ca2d (patch)
treef4fd7eed75963295c074ff08e517e90b19db5287 /sound/usb/Kconfig
parent3d37fbe44112b06279efa04ad91a0e4b7a0c600c (diff)
downloadlinux-e653510a27e63b41a5bae3c46eb093375e17ca2d.tar.gz
linux-e653510a27e63b41a5bae3c46eb093375e17ca2d.tar.bz2
linux-e653510a27e63b41a5bae3c46eb093375e17ca2d.zip
ALSA: snd-usb-caiaq: Add support for Maschine
This adds partial support for the Maschine controller by Native Instruments. Supported now are the 1x1 MIDI interface and the 41 buttons, 11 endless rotary encoders, and 16 pressure-sensitive drum pads. Still to work on are the dimmable LEDs and the two monochrome screens. Signed-off-by: William Light <wrl@illest.net> 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 8beb77563da2..3efc21c3d67c 100644
--- a/sound/usb/Kconfig
+++ b/sound/usb/Kconfig
@@ -67,6 +67,7 @@ config SND_USB_CAIAQ
* Native Instruments Guitar Rig mobile
* Native Instruments Traktor Kontrol X1
* Native Instruments Traktor Kontrol S4
+ * Native Instruments Maschine Controller
To compile this driver as a module, choose M here: the module
will be called snd-usb-caiaq.
@@ -85,6 +86,7 @@ config SND_USB_CAIAQ_INPUT
* Native Instruments Kore Controller 2
* Native Instruments Audio Kontrol 1
* Native Instruments Traktor Kontrol S4
+ * Native Instruments Maschine Controller
config SND_USB_US122L
tristate "Tascam US-122L USB driver"