sound: Convert to menuconfig

Convert menu in sound Kconfig files to menuconfig and if.

Signed-off-by: Takashi Iwai <tiwai@suse.de>

1 files changed, 34 insertions, 37 deletions

diff --git a/sound/drivers/Kconfig b/sound/drivers/Kconfig
index 159137bf4c11..79b4d3f25665 100644
--- a/sound/drivers/Kconfig
+++ b/sound/drivers/Kconfig
@@ -1,15 +1,41 @@
-# ALSA generic drivers
+config SND_MPU401_UART
+        tristate
+        select SND_RAWMIDI
 
-menu "Generic devices"
-        depends on SND!=n
+config SND_OPL3_LIB
+        tristate
+        select SND_TIMER
+        select SND_HWDEP
 
+config SND_OPL4_LIB
+        tristate
+        select SND_TIMER
+        select SND_HWDEP
+
+config SND_VX_LIB
+        tristate
+        select SND_HWDEP
+        select SND_PCM
+
+config SND_AC97_CODEC
+        tristate
+        select SND_PCM
+        select AC97_BUS
+        select SND_VMASTER
+
+menuconfig SND_DRIVERS
+        bool "Generic sound devices"
+        default y
+        help
+          Support for generic sound devices.
+  
+if SND_DRIVERS
 
 config SND_PCSP
         tristate "PC-Speaker support (READ HELP!)"
         depends on PCSPKR_PLATFORM && X86_PC && HIGH_RES_TIMERS
         depends on INPUT
         depends on EXPERIMENTAL
-        depends on SND
         select SND_PCM
         help
           If you don't have a sound card in your computer, you can include a
@@ -35,34 +61,8 @@ config SND_PCSP
           Say M if you don't.
           Say Y only if you really know what you do.
 
-config SND_MPU401_UART
-        tristate
-        select SND_RAWMIDI
-
-config SND_OPL3_LIB
-        tristate
-        select SND_TIMER
-        select SND_HWDEP
-
-config SND_OPL4_LIB
-        tristate
-        select SND_TIMER
-        select SND_HWDEP
-
-config SND_VX_LIB
-        tristate
-        select SND_HWDEP
-        select SND_PCM
-
-config SND_AC97_CODEC
-        tristate
-        select SND_PCM
-        select AC97_BUS
-        select SND_VMASTER
-
 config SND_DUMMY
         tristate "Dummy (/dev/null) soundcard"
-        depends on SND
         select SND_PCM
         help
           Say Y here to include the dummy driver.  This driver does
@@ -91,7 +91,6 @@ config SND_VIRMIDI
 
 config SND_MTPAV
         tristate "MOTU MidiTimePiece AV multiport MIDI"
-        depends on SND
         select SND_RAWMIDI
         help
           To use a MOTU MidiTimePiece AV multiport MIDI adapter
@@ -103,7 +102,7 @@ config SND_MTPAV
 
 config SND_MTS64
         tristate "ESI Miditerminal 4140 driver"
-        depends on SND && PARPORT
+        depends on PARPORT
         select SND_RAWMIDI
         help
           The ESI Miditerminal 4140 is a 4 In 4 Out MIDI Interface with 
@@ -116,7 +115,6 @@ config SND_MTS64
 
 config SND_SERIAL_U16550
         tristate "UART16550 serial MIDI driver"
-        depends on SND
         select SND_RAWMIDI
         help
           To include support for MIDI serial port interfaces, say Y here
@@ -132,7 +130,6 @@ config SND_SERIAL_U16550
 
 config SND_MPU401
         tristate "Generic MPU-401 UART driver"
-        depends on SND
         select SND_MPU401_UART
         help
           Say Y here to include support for MIDI ports compatible with
@@ -143,7 +140,7 @@ config SND_MPU401
 
 config SND_PORTMAN2X4
         tristate "Portman 2x4 driver"
-        depends on SND && PARPORT
+        depends on PARPORT
         select SND_RAWMIDI
         help
           Say Y here to include support for Midiman Portman 2x4 parallel
@@ -154,7 +151,7 @@ config SND_PORTMAN2X4
 
 config SND_ML403_AC97CR
         tristate "Xilinx ML403 AC97 Controller Reference"
-        depends on SND && XILINX_VIRTEX
+        depends on XILINX_VIRTEX
         select SND_AC97_CODEC
         help
           Say Y here to include support for the
@@ -164,4 +161,4 @@ config SND_ML403_AC97CR
           To compile this driver as a module, choose M here: the module
           will be called snd-ml403_ac97cr.
 
-endmenu
+endif   # SND_DRIVERS