diff options
| author | David Brownell <dbrownell@users.sourceforge.net> | 2007-03-21 11:54:04 +0100 |
|---|---|---|
| committer | Jaroslav Kysela <perex@suse.cz> | 2007-05-11 16:55:51 +0200 |
| commit | 97a1dd5bee9edab5172553cbdcfc858393814556 (patch) | |
| tree | d75c3791089d115cfa8c9ab0af305f50c9fc5973 | |
| parent | 83c51c0ab08f55468d8f5444ff2f70a36841a21f (diff) | |
| download | kernel_samsung_crespo-97a1dd5bee9edab5172553cbdcfc858393814556.zip kernel_samsung_crespo-97a1dd5bee9edab5172553cbdcfc858393814556.tar.gz kernel_samsung_crespo-97a1dd5bee9edab5172553cbdcfc858393814556.tar.bz2 | |
[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>
| -rw-r--r-- | sound/soc/Kconfig | 3 | ||||
| -rw-r--r-- | sound/soc/at91/Kconfig | 4 | ||||
| -rw-r--r-- | sound/soc/pxa/Kconfig | 4 | ||||
| -rw-r--r-- | sound/soc/s3c24xx/Kconfig | 5 |
4 files changed, 0 insertions, 16 deletions
diff --git a/sound/soc/Kconfig b/sound/soc/Kconfig index 03e04ae..23a5c3b 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 a5b2558..e41e75e 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 b9ab3b8..a83e229 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 bb6e00a..044a371 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 - |