diff options
| author | Takashi Iwai <tiwai@suse.de> | 2012-05-23 01:37:59 +0200 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2012-05-23 01:37:59 +0200 |
| commit | 599ed4b0aeceb6d45ea33f64639e745e3da72766 (patch) | |
| tree | d1d68299eacda3b12097bd3a7d4e7c895e3d6a13 /sound/soc/omap/Kconfig | |
| parent | Merge tag 'asoc-3.5' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie... (diff) | |
| parent | ASoC: OMAP: HDMI: Rename sound card source file (diff) | |
| download | linux-599ed4b0aeceb6d45ea33f64639e745e3da72766.tar.xz linux-599ed4b0aeceb6d45ea33f64639e745e3da72766.zip | |
Merge branch 'for-3.5' of git://git.kernel.org/pub/scm/linux/kernel/git/lrg/asoc into topic/asoc
Diffstat (limited to 'sound/soc/omap/Kconfig')
| -rw-r--r-- | sound/soc/omap/Kconfig | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/sound/soc/omap/Kconfig b/sound/soc/omap/Kconfig index 9ccfa5e1c11b..57a2fa751085 100644 --- a/sound/soc/omap/Kconfig +++ b/sound/soc/omap/Kconfig @@ -109,11 +109,12 @@ config SND_OMAP_SOC_OMAP_ABE_TWL6040 - PandaBoard (4430) - PandaBoardES (4460) -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 +config SND_OMAP_SOC_OMAP_HDMI + tristate "SoC Audio support for Texas Instruments OMAP HDMI" + depends on SND_OMAP_SOC && OMAP4_DSS_HDMI && OMAP2_DSS select SND_OMAP_SOC_HDMI select SND_SOC_OMAP_HDMI_CODEC + select OMAP4_DSS_HDMI_AUDIO help Say Y if you want to add support for SoC HDMI audio on Texas Instruments OMAP4 chips |