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

[linux-2.6-block.git] / sound / usb / Kconfig

diff --git a/sound/usb/Kconfig b/sound/usb/Kconfig
index 315360f312787cd0ef116a33d6af9ebd51b5fc07..9351b8a765b9c6de7f5069e2c3c6d09b0f54a50d 100644 (file)
--- a/sound/usb/Kconfig
+++ b/sound/usb/Kconfig
@@ -31,16 +31,18 @@ config SND_USB_USX2Y
 
 config SND_USB_CAIAQ
        tristate "Native Instruments USB audio devices"
-        depends on SND && USB
-        select SND_HWDEP
-        select SND_RAWMIDI
-        select SND_PCM
-        help
+       depends on SND && USB
+       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
 
@@ -50,11 +52,15 @@ config 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
 
 endmenu