Skip to contentSkip to conversation

fix SND_SOC Kconfig

PATCH In review David Brownell 2 participants 2 messages Mar 20, 2007 – Mar 21, 2007

Subsystems (4)
lore
Share & tools
lore
#0 lore raw

PATCH 1/1 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.

sound/soc/Kconfig +0 -3
Index: g26/sound/soc/Kconfig
===================================================================
@@ -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"
sound/soc/at91/Kconfig +0 -4
Index: g26/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
sound/soc/pxa/Kconfig +0 -4
Index: g26/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
#1 lore raw

At Tue, 20 Mar 2007 13:49:51 -0700,

Quoted 10 lines · David Brownell

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.

Thanks, I applied it to ALSA tree now.

Takashi

Quoted 55 lines

Index: g26/sound/soc/Kconfig
===================================================================

sound/soc/Kconfig +0 -3
@@ -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
===================================================================

sound/soc/at91/Kconfig +0 -4
@@ -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
===================================================================

sound/soc/pxa/Kconfig +0 -5
@@ -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 [email protected]
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/