[ALSA] fix SND_SOC Kconfig

The new ALSA 'SOC' support has bogus Kconfig ... it should
not be presenting anything AT91-related except on AT91,
or anything PXA-related except on PXA.  Right now, x86
sees both of those menus, as do all other platforms.
This patch removes needless Kconfig layering, and the
related inappropriate choice presentation.

Signed-off-by: David Brownell <dbrownell@users.sourceforge.net>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
Signed-off-by: Jaroslav Kysela <perex@suse.cz>

diff --git a/sound/soc/Kconfig b/sound/soc/Kconfig
index 03e04aecd74c23799d88b6ca3aa115a0669fa770..23a5c3b7e5d5117665e32fb2d03d93843d107307 100644 (file)
--- a/sound/soc/Kconfig
+++ b/sound/soc/Kconfig
@@ -22,12 +22,9 @@ config SND_SOC
          will be called snd-soc-core.
 
 # All the supported Soc's
-menu "SoC Platforms"
-depends on SND_SOC
 source "sound/soc/at91/Kconfig"
 source "sound/soc/pxa/Kconfig"
 source "sound/soc/s3c24xx/Kconfig"
-endmenu
 
 # Supported codecs
 source "sound/soc/codecs/Kconfig"

diff --git a/sound/soc/at91/Kconfig b/sound/soc/at91/Kconfig
index a5b2558916c1124eb0d9a3c2017f32920873d24a..e41e75edc3dfc18bb0c3ad96d6158e2af71dc75a 100644 (file)
--- a/sound/soc/at91/Kconfig
+++ b/sound/soc/at91/Kconfig
@@ -1,5 +1,3 @@
-menu "SoC Audio for the Atmel AT91"
-
 config SND_AT91_SOC
        tristate "SoC Audio for the Atmel AT91 System-on-Chip"
        depends on ARCH_AT91 && SND_SOC
@@ -27,5 +25,3 @@ config SND_AT91_SOC_ETI_SLAVE
        help
          Say Y if you want to run with the AT91 SSC generating the BCLK
          and LRC signals on Endrelia boards.
-
-endmenu

diff --git a/sound/soc/pxa/Kconfig b/sound/soc/pxa/Kconfig
index b9ab3b8e1d3ecdff0aec3ec1823e1c6f3f5e19dd..a83e22937c270ce0d92720203d73de99f8d1e434 100644 (file)
--- a/sound/soc/pxa/Kconfig
+++ b/sound/soc/pxa/Kconfig
@@ -1,5 +1,3 @@
-menu "SoC Audio for the Intel PXA2xx"
-
 config SND_PXA2XX_SOC
        tristate "SoC Audio for the Intel PXA2xx chip"
        depends on ARCH_PXA && SND_SOC
@@ -55,5 +53,3 @@ config SND_PXA2XX_SOC_TOSA
        help
          Say Y if you want to add support for SoC audio on Sharp
          Zaurus SL-C6000x models (Tosa).
-
-endmenu

diff --git a/sound/soc/s3c24xx/Kconfig b/sound/soc/s3c24xx/Kconfig
index bb6e00a1cf6690bcf398a8e604896f19dadd1e69..044a3712077a952a68bedde88efa51084c79bd8d 100644 (file)
--- a/sound/soc/s3c24xx/Kconfig
+++ b/sound/soc/s3c24xx/Kconfig
@@ -1,5 +1,3 @@
-menu "SoC Audio for the Samsung S3C24XX"
-
 config SND_S3C24XX_SOC
        tristate "SoC Audio for the Samsung S3C24XX chips"
        depends on ARCH_S3C2410 && SND_SOC
@@ -10,6 +8,3 @@ config SND_S3C24XX_SOC
 
 config SND_S3C24XX_SOC_I2S
        tristate
-
-endmenu
-