From 97a1dd5bee9edab5172553cbdcfc858393814556 Mon Sep 17 00:00:00 2001 From: David Brownell Date: Wed, 21 Mar 2007 11:54:04 +0100 Subject: [PATCH] [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 Signed-off-by: Takashi Iwai Signed-off-by: Jaroslav Kysela --- sound/soc/Kconfig | 3 --- sound/soc/at91/Kconfig | 4 ---- sound/soc/pxa/Kconfig | 4 ---- sound/soc/s3c24xx/Kconfig | 5 ----- 4 files changed, 16 deletions(-) diff --git a/sound/soc/Kconfig b/sound/soc/Kconfig index 03e04aecd7..23a5c3b7e5 100644 --- 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 a5b2558916..e41e75edc3 100644 --- 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 b9ab3b8e1d..a83e22937c 100644 --- 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 bb6e00a1cf..044a371207 100644 --- 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 - -- 2.39.5