Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/torvalds/linux-2.6

[linux-2.6] / sound / soc / pxa / Kconfig

diff --git a/sound/soc/pxa/Kconfig b/sound/soc/pxa/Kconfig
index 18a40dc8ad9dfa89c01b1e004f80d1f501730595..9212c37a33b8c8a9275d43e3ddfd45eb34e54456 100644 (file)
--- a/sound/soc/pxa/Kconfig
+++ b/sound/soc/pxa/Kconfig
@@ -48,6 +48,7 @@ config SND_PXA2XX_SOC_POODLE
 config SND_PXA2XX_SOC_TOSA
        tristate "SoC AC97 Audio support for Tosa"
        depends on SND_PXA2XX_SOC && MACH_TOSA
+       depends on MFD_TC6393XB
        select SND_PXA2XX_SOC_AC97
        select SND_SOC_WM9712
        help
@@ -62,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.