summaryrefslogtreecommitdiffstats
path: root/sound/soc/omap/Kconfig
diff options
context:
space:
mode:
authorTakashi Iwai <tiwai@suse.de>2011-07-05 07:33:23 +0200
committerTakashi Iwai <tiwai@suse.de>2011-07-05 07:33:23 +0200
commit56aa53391059e3730a304da4dd96b7b123b9fb75 (patch)
tree35d228687f9d15509cd39b9797adef4cf047906e /sound/soc/omap/Kconfig
parent1ae4e9b99682adfe9ae170ed593f26fe89eb65b5 (diff)
parent404b566569cdcba71e0ee875d08053486309e56e (diff)
downloadlinux-56aa53391059e3730a304da4dd96b7b123b9fb75.tar.bz2
Merge branch 'for-3.1' of git://git.kernel.org/pub/scm/linux/kernel/git/lrg/asoc-2.6 into topic/asoc
Diffstat (limited to 'sound/soc/omap/Kconfig')
-rw-r--r--sound/soc/omap/Kconfig11
1 files changed, 11 insertions, 0 deletions
diff --git a/sound/soc/omap/Kconfig b/sound/soc/omap/Kconfig
index 99054cf1f68f..fe83d0d176be 100644
--- 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
@@ -100,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