Merge branch 'for-3.1' of git://git.kernel.org/pub/scm/linux/kernel/git/lrg/asoc...

[pandora-kernel.git] / sound / soc / omap / Kconfig

diff --git a/sound/soc/omap/Kconfig b/sound/soc/omap/Kconfig
index b592298..fe83d0d 100644 (file)
--- a/sound/soc/omap/Kconfig
+++ b/sound/soc/omap/Kconfig
@@ -9,6 +9,9 @@ config SND_OMAP_SOC_MCBSP
 config SND_OMAP_SOC_MCPDM
        tristate
 
+config SND_OMAP_SOC_HDMI
+       tristate
+
 config SND_OMAP_SOC_N810
        tristate "SoC Audio support for Nokia N810"
        depends on SND_OMAP_SOC && MACH_NOKIA_N810 && I2C
@@ -65,14 +68,6 @@ config SND_OMAP_SOC_OVERO
          Say Y if you want to add support for SoC audio on the
          Gumstix Overo or CompuLab CM-T35
 
-config SND_OMAP_SOC_OMAP2EVM
-       tristate "SoC Audio support for OMAP2EVM board"
-       depends on TWL4030_CORE && SND_OMAP_SOC && MACH_OMAP2EVM
-       select SND_OMAP_SOC_MCBSP
-       select SND_SOC_TWL4030
-       help
-         Say Y if you want to add support for SoC audio on the omap2evm board.
-
 config SND_OMAP_SOC_OMAP3EVM
        tristate "SoC Audio support for OMAP3EVM board"
        depends on TWL4030_CORE && SND_OMAP_SOC && MACH_OMAP3EVM
@@ -108,6 +103,14 @@ config SND_OMAP_SOC_SDP4430
          Say Y if you want to add support for SoC audio on Texas Instruments
          SDP4430.
 
+config SND_OMAP_SOC_OMAP4_HDMI
+       tristate "SoC Audio support for Texas Instruments OMAP4 HDMI"
+       depends on SND_OMAP_SOC && OMAP4_DSS_HDMI && OMAP2_DSS && ARCH_OMAP4
+       select SND_OMAP_SOC_HDMI
+       help
+         Say Y if you want to add support for SoC HDMI audio on Texas Instruments
+         OMAP4 chips
+
 config SND_OMAP_SOC_OMAP3_PANDORA
        tristate "SoC Audio support for OMAP3 Pandora"
        depends on TWL4030_CORE && SND_OMAP_SOC && MACH_OMAP3_PANDORA