Merge branch 'devel' of master.kernel.org:/home/rmk/linux-2.6-arm

[sfrench/cifs-2.6.git] / sound / soc / pxa / Kconfig

diff --git a/sound/soc/pxa/Kconfig b/sound/soc/pxa/Kconfig
index 329b33f37ef38a88677a19a9cee078e780ca11af..9212c37a33b8c8a9275d43e3ddfd45eb34e54456 100644 (file)
--- a/sound/soc/pxa/Kconfig
+++ b/sound/soc/pxa/Kconfig
@@ -1,6 +1,6 @@
 config SND_PXA2XX_SOC
        tristate "SoC Audio for the Intel PXA2xx chip"
-       depends on ARCH_PXA && SND_SOC
+       depends on ARCH_PXA
        help
          Say Y or M if you want to add support for codecs attached to
          the PXA2xx AC97, I2S or SSP interface. You will also need
@@ -63,3 +63,12 @@ config SND_PXA2XX_SOC_E800
        help
          Say Y if you want to add support for SoC audio on the
          Toshiba e800 PDA
+
+config SND_PXA2XX_SOC_EM_X270
+       tristate "SoC Audio support for CompuLab EM-x270"
+       depends on SND_PXA2XX_SOC && MACH_EM_X270
+       select SND_PXA2XX_SOC_AC97
+       select SND_SOC_WM9712
+       help
+         Say Y if you want to add support for SoC audio on
+         CompuLab EM-x270.