Merge branch 'x86/for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip...

[pandora-kernel.git] / sound / usb / Kconfig

diff --git a/sound/usb/Kconfig b/sound/usb/Kconfig
index f05d02f..ffcdc8f 100644 (file)
--- a/sound/usb/Kconfig
+++ b/sound/usb/Kconfig
@@ -1,11 +1,16 @@
 # ALSA USB drivers
 
-menu "USB devices"
-       depends on SND!=n && USB!=n
+menuconfig SND_USB
+       bool "USB sound devices"
+       depends on USB
+       default y
+       help
+         Support for sound devices connected via the USB bus.
+
+if SND_USB && USB
 
 config SND_USB_AUDIO
        tristate "USB Audio/MIDI driver"
-       depends on SND && USB
        select SND_HWDEP
        select SND_RAWMIDI
        select SND_PCM
@@ -18,7 +23,7 @@ config SND_USB_AUDIO
 
 config SND_USB_USX2Y
        tristate "Tascam US-122, US-224 and US-428 USB driver"
-       depends on SND && USB && (X86 || PPC || ALPHA)
+       depends on X86 || PPC || ALPHA
        select SND_HWDEP
        select SND_RAWMIDI
        select SND_PCM
@@ -29,5 +34,38 @@ config SND_USB_USX2Y
          To compile this driver as a module, choose M here: the module
          will be called snd-usb-usx2y.
 
-endmenu
+config SND_USB_CAIAQ
+       tristate "Native Instruments USB audio devices"
+       select SND_HWDEP
+       select SND_RAWMIDI
+       select SND_PCM
+       help
+          Say Y here to include support for caiaq USB audio interfaces,
+          namely:
+
+           * Native Instruments RigKontrol2
+           * Native Instruments RigKontrol3
+           * Native Instruments Kore Controller
+           * Native Instruments Kore Controller 2
+           * Native Instruments Audio Kontrol 1
+           * Native Instruments Audio 8 DJ
+
+          To compile this driver as a module, choose M here: the module
+          will be called snd-usb-caiaq.
+
+config SND_USB_CAIAQ_INPUT
+       bool "enable input device for controllers"
+       depends on SND_USB_CAIAQ
+       depends on INPUT=y || INPUT=SND_USB_CAIAQ
+       help
+         Say Y here to support input controllers like buttons, knobs,
+         alpha dials and analog pedals on the following products:
+
+          * Native Instruments RigKontrol2
+          * Native Instruments RigKontrol3
+          * Native Instruments Kore Controller
+          * Native Instruments Kore Controller 2
+          * Native Instruments Audio Kontrol 1
+
+endif  # SND_USB