sound: Convert to menuconfig

[linux-2.6-omap-h63xx.git] / sound / usb / Kconfig

diff --git a/sound/usb/Kconfig b/sound/usb/Kconfig
index 706143826aff8102977b9c1cffa72d66ce0684ae..ffcdc8f4ef66de645e41ffa2881d12fc1ce5e0e9 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
@@ -31,17 +36,17 @@ 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
+       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
 
@@ -51,13 +56,16 @@ 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
+endif  # SND_USB