diff options
| author | Takashi Iwai <tiwai@suse.de> | 2012-05-22 19:37:59 -0400 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2012-05-22 19:37:59 -0400 |
| commit | 599ed4b0aeceb6d45ea33f64639e745e3da72766 (patch) | |
| tree | d1d68299eacda3b12097bd3a7d4e7c895e3d6a13 /sound/soc/omap/Kconfig | |
| parent | 85e184e4c3cd3e2285ceab91ff8f0cac094e8a85 (diff) | |
| parent | ced47a3117ba084b404f3fc28de3ef6eaba1b911 (diff) | |
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 | |||
| 109 | - PandaBoard (4430) | 109 | - PandaBoard (4430) |
| 110 | - PandaBoardES (4460) | 110 | - PandaBoardES (4460) |
| 111 | 111 | ||
| 112 | config SND_OMAP_SOC_OMAP4_HDMI | 112 | config SND_OMAP_SOC_OMAP_HDMI |
| 113 | tristate "SoC Audio support for Texas Instruments OMAP4 HDMI" | 113 | tristate "SoC Audio support for Texas Instruments OMAP HDMI" |
| 114 | depends on SND_OMAP_SOC && OMAP4_DSS_HDMI && OMAP2_DSS && ARCH_OMAP4 | 114 | depends on SND_OMAP_SOC && OMAP4_DSS_HDMI && OMAP2_DSS |
| 115 | select SND_OMAP_SOC_HDMI | 115 | select SND_OMAP_SOC_HDMI |
| 116 | select SND_SOC_OMAP_HDMI_CODEC | 116 | select SND_SOC_OMAP_HDMI_CODEC |
| 117 | select OMAP4_DSS_HDMI_AUDIO | ||
| 117 | help | 118 | help |
| 118 | Say Y if you want to add support for SoC HDMI audio on Texas Instruments | 119 | Say Y if you want to add support for SoC HDMI audio on Texas Instruments |
| 119 | OMAP4 chips | 120 | OMAP4 chips |