Commit 97a1dd5b authored by David Brownell's avatar David Brownell Committed by Jaroslav Kysela

[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: default avatarDavid Brownell <dbrownell@users.sourceforge.net>
Signed-off-by: default avatarTakashi Iwai <tiwai@suse.de>
Signed-off-by: default avatarJaroslav Kysela <perex@suse.cz>
parent 83c51c0a
...@@ -22,12 +22,9 @@ config SND_SOC ...@@ -22,12 +22,9 @@ config SND_SOC
will be called snd-soc-core. will be called snd-soc-core.
# All the supported Soc's # All the supported Soc's
menu "SoC Platforms"
depends on SND_SOC
source "sound/soc/at91/Kconfig" source "sound/soc/at91/Kconfig"
source "sound/soc/pxa/Kconfig" source "sound/soc/pxa/Kconfig"
source "sound/soc/s3c24xx/Kconfig" source "sound/soc/s3c24xx/Kconfig"
endmenu
# Supported codecs # Supported codecs
source "sound/soc/codecs/Kconfig" source "sound/soc/codecs/Kconfig"
......
menu "SoC Audio for the Atmel AT91"
config SND_AT91_SOC config SND_AT91_SOC
tristate "SoC Audio for the Atmel AT91 System-on-Chip" tristate "SoC Audio for the Atmel AT91 System-on-Chip"
depends on ARCH_AT91 && SND_SOC depends on ARCH_AT91 && SND_SOC
...@@ -27,5 +25,3 @@ config SND_AT91_SOC_ETI_SLAVE ...@@ -27,5 +25,3 @@ config SND_AT91_SOC_ETI_SLAVE
help help
Say Y if you want to run with the AT91 SSC generating the BCLK Say Y if you want to run with the AT91 SSC generating the BCLK
and LRC signals on Endrelia boards. and LRC signals on Endrelia boards.
endmenu
menu "SoC Audio for the Intel PXA2xx"
config SND_PXA2XX_SOC config SND_PXA2XX_SOC
tristate "SoC Audio for the Intel PXA2xx chip" tristate "SoC Audio for the Intel PXA2xx chip"
depends on ARCH_PXA && SND_SOC depends on ARCH_PXA && SND_SOC
...@@ -55,5 +53,3 @@ config SND_PXA2XX_SOC_TOSA ...@@ -55,5 +53,3 @@ config SND_PXA2XX_SOC_TOSA
help help
Say Y if you want to add support for SoC audio on Sharp Say Y if you want to add support for SoC audio on Sharp
Zaurus SL-C6000x models (Tosa). Zaurus SL-C6000x models (Tosa).
endmenu
menu "SoC Audio for the Samsung S3C24XX"
config SND_S3C24XX_SOC config SND_S3C24XX_SOC
tristate "SoC Audio for the Samsung S3C24XX chips" tristate "SoC Audio for the Samsung S3C24XX chips"
depends on ARCH_S3C2410 && SND_SOC depends on ARCH_S3C2410 && SND_SOC
...@@ -10,6 +8,3 @@ config SND_S3C24XX_SOC ...@@ -10,6 +8,3 @@ config SND_S3C24XX_SOC
config SND_S3C24XX_SOC_I2S config SND_S3C24XX_SOC_I2S
tristate tristate
endmenu
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment