Merge mainline v2.6.27-rc2 tree into linux-omap tree

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

diff --git a/sound/arm/Kconfig b/sound/arm/Kconfig
index c685a9cd9aec4e44bc86a9165ab7756d9a29b981..06a24df059f8d1e166bb92a81d165c7ae6a002a3 100644 (file)
--- a/sound/arm/Kconfig
+++ b/sound/arm/Kconfig
@@ -1,11 +1,19 @@
 # ALSA ARM drivers
 
-menu "ALSA ARM devices"
-       depends on SND!=n && ARM
+menuconfig SND_ARM
+       bool "ARM sound devices"
+       depends on ARM
+       default y
+       help
+         Support for sound devices specific to ARM architectures.
+         Drivers that are implemented on ASoC can be found in
+         "ALSA for SoC audio support" section.
+
+if SND_ARM
 
 config SND_SA11XX_UDA1341
        tristate "SA11xx UDA1341TS driver (iPaq H3600)"
-       depends on ARCH_SA1100 && SND && L3
+       depends on ARCH_SA1100 && L3
        select SND_PCM
        help
          Say Y here if you have a Compaq iPaq H3x00 handheld computer
@@ -16,7 +24,7 @@ config SND_SA11XX_UDA1341
 
 config SND_ARMAACI
        tristate "ARM PrimeCell PL041 AC Link support"
-       depends on SND && ARM_AMBA
+       depends on ARM_AMBA
        select SND_PCM
        select SND_AC97_CODEC
 
@@ -26,7 +34,7 @@ config SND_PXA2XX_PCM
 
 config SND_PXA2XX_AC97
        tristate "AC97 driver for the Intel PXA2xx chip"
-       depends on ARCH_PXA && SND
+       depends on ARCH_PXA
        select SND_PXA2XX_PCM
        select SND_AC97_CODEC
        help
@@ -97,4 +105,4 @@ config SND_OMAP24XX_EAC
          To compile this driver as a module, choose M here: the module
          will be called snd-omap24xx-eac.
 
-endmenu
+endif  # SND_ARM