Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

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

[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

sound/soc/Kconfig

+0 −3
Original line number Diff line number Diff line
@@ -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"

sound/soc/at91/Kconfig

+0 −4
Original line number Diff line number Diff line 
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

sound/soc/pxa/Kconfig

+0 −4
Original line number Diff line number Diff line 
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

sound/soc/s3c24xx/Kconfig

+0 −5
Original line number Diff line number Diff line 
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