diff options
| author | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2008-07-15 01:44:51 -0400 |
|---|---|---|
| committer | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2008-07-15 01:44:51 -0400 |
| commit | 43d2548bb2ef7e6d753f91468a746784041e522d (patch) | |
| tree | 77d13fcd48fd998393abb825ec36e2b732684a73 /sound/soc/omap/Kconfig | |
| parent | 585583d95c5660973bc0cf64add517b040acd8a4 (diff) | |
| parent | 85082fd7cbe3173198aac0eb5e85ab1edcc6352c (diff) | |
Merge commit '85082fd7cbe3173198aac0eb5e85ab1edcc6352c' into test-build
Manual fixup of:
arch/powerpc/Kconfig
Diffstat (limited to 'sound/soc/omap/Kconfig')
| -rw-r--r-- | sound/soc/omap/Kconfig | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/sound/soc/omap/Kconfig b/sound/soc/omap/Kconfig index 0230d83e8e5e..aea27e70043c 100644 --- a/sound/soc/omap/Kconfig +++ b/sound/soc/omap/Kconfig | |||
| @@ -1,5 +1,3 @@ | |||
| 1 | menu "SoC Audio for the Texas Instruments OMAP" | ||
| 2 | |||
| 3 | config SND_OMAP_SOC | 1 | config SND_OMAP_SOC |
| 4 | tristate "SoC Audio for the Texas Instruments OMAP chips" | 2 | tristate "SoC Audio for the Texas Instruments OMAP chips" |
| 5 | depends on ARCH_OMAP && SND_SOC | 3 | depends on ARCH_OMAP && SND_SOC |
| @@ -15,5 +13,3 @@ config SND_OMAP_SOC_N810 | |||
| 15 | select SND_SOC_TLV320AIC3X | 13 | select SND_SOC_TLV320AIC3X |
| 16 | help | 14 | help |
| 17 | Say Y if you want to add support for SoC audio on Nokia N810. | 15 | Say Y if you want to add support for SoC audio on Nokia N810. |
| 18 | |||
| 19 | endmenu | ||