Merge branch 'powerpc-next' of master.kernel.org:/pub/scm/linux/kernel/git/galak...

[linux-2.6-omap-h63xx.git] / sound / soc / pxa / Kconfig

diff --git a/sound/soc/pxa/Kconfig b/sound/soc/pxa/Kconfig
index b9ab3b8e1d3ecdff0aec3ec1823e1c6f3f5e19dd..484f883459e086a95af2ff2edd881b8c8b9a0500 100644 (file)
--- 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
@@ -56,4 +54,11 @@ config SND_PXA2XX_SOC_TOSA
          Say Y if you want to add support for SoC audio on Sharp
          Zaurus SL-C6000x models (Tosa).
 
-endmenu
+config SND_PXA2XX_SOC_E800
+       tristate "SoC AC97 Audio support for e800"
+       depends on SND_PXA2XX_SOC && MACH_E800
+       select SND_SOC_WM9712
+       select SND_PXA2XX_SOC_AC97
+       help
+         Say Y if you want to add support for SoC audio on the
+         Toshiba e800 PDA