Merge branch 'for-2.6.30' into for-2.6.31

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

diff --git a/sound/soc/pxa/Kconfig b/sound/soc/pxa/Kconfig
index 958ac3f..ad8a10f 100644 (file)
--- a/sound/soc/pxa/Kconfig
+++ b/sound/soc/pxa/Kconfig
@@ -115,3 +115,22 @@ config SND_SOC_ZYLONITE
        help
          Say Y if you want to add support for SoC audio on the
          Marvell Zylonite reference platform.
+
+config SND_PXA2XX_SOC_MAGICIAN
+       tristate "SoC Audio support for HTC Magician"
+       depends on SND_PXA2XX_SOC && MACH_MAGICIAN
+       select SND_PXA2XX_SOC_I2S
+       select SND_PXA_SOC_SSP
+       select SND_SOC_UDA1380
+       help
+         Say Y if you want to add support for SoC audio on the
+         HTC Magician.
+
+config SND_PXA2XX_SOC_MIOA701
+        tristate "SoC Audio support for MIO A701"
+        depends on SND_PXA2XX_SOC && MACH_MIOA701
+        select SND_PXA2XX_SOC_AC97
+        select SND_SOC_WM9713
+        help
+          Say Y if you want to add support for SoC audio on the
+          MIO A701.