Messages in this thread Patch in this message | | | From | David Brownell <> | Subject | [patch 2.6.21-rc4-git] fix SND_SOC Kconfig | Date | Tue, 20 Mar 2007 13:49:51 -0700 |
| |
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>
Index: g26/sound/soc/Kconfig =================================================================== --- g26.orig/sound/soc/Kconfig 2007-03-18 14:11:36.000000000 -0700 +++ g26/sound/soc/Kconfig 2007-03-20 13:33:06.000000000 -0700 @@ -22,11 +22,8 @@ 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" -endmenu # Supported codecs source "sound/soc/codecs/Kconfig" Index: g26/sound/soc/at91/Kconfig =================================================================== --- g26.orig/sound/soc/at91/Kconfig 2007-03-18 14:11:36.000000000 -0700 +++ g26/sound/soc/at91/Kconfig 2007-03-20 13:31:52.000000000 -0700 @@ -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 Index: g26/sound/soc/pxa/Kconfig =================================================================== --- g26.orig/sound/soc/pxa/Kconfig 2007-03-18 14:11:36.000000000 -0700 +++ g26/sound/soc/pxa/Kconfig 2007-03-20 13:31:57.000000000 -0700 @@ -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 - To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
| |