Merge branch 'topic/hdsp' into for-linus

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

diff --git a/sound/soc/pxa/Kconfig b/sound/soc/pxa/Kconfig
index 5998ab366e833d8763780643ede4d66d6ca142f0..dcd163a4ee9ac02283ed1ff397822249f96c5e0d 100644 (file)
--- a/sound/soc/pxa/Kconfig
+++ b/sound/soc/pxa/Kconfig
@@ -89,13 +89,13 @@ config SND_PXA2XX_SOC_E800
          Toshiba e800 PDA
 
 config SND_PXA2XX_SOC_EM_X270
-       tristate "SoC Audio support for CompuLab EM-x270"
+       tristate "SoC Audio support for CompuLab EM-x270, eXeda and CM-X300"
        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.
+         CompuLab EM-x270, eXeda and CM-X300 machines.
 
 config SND_PXA2XX_SOC_PALM27X
        bool "SoC Audio support for Palm T|X, T5 and LifeDrive"
@@ -116,6 +116,16 @@ config SND_SOC_ZYLONITE
          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
@@ -124,3 +134,12 @@ config SND_PXA2XX_SOC_MIOA701
         help
           Say Y if you want to add support for SoC audio on the
           MIO A701.
+
+config SND_PXA2XX_SOC_IMOTE2
+       tristate "SoC Audio support for IMote 2"
+       depends on SND_PXA2XX_SOC && MACH_INTELMOTE2
+       select SND_PXA2XX_SOC_I2S
+       select SND_SOC_WM8940
+       help
+         Say Y if you want to add support for SoC audio on the
+        IMote 2.