diff options
| author | NeilBrown <neilb@suse.de> | 2013-07-26 11:04:53 +1000 |
|---|---|---|
| committer | NeilBrown <neilb@suse.de> | 2013-07-26 11:04:53 +1000 |
| commit | 1bf3c840b8061c526c0f442d9697311572d9cc6e (patch) | |
| tree | b6fc101b797024e47cec240b90e12864dc70fa0f /sound/soc/omap/Kconfig | |
| parent | 855ee922b7f6df94a36bb8acff0a354550203e39 (diff) | |
| parent | b3a3a9c441e2c8f6b6760de9331023a7906a4ac6 (diff) | |
| download | kernel_goldelico_gta04-1bf3c840b8061c526c0f442d9697311572d9cc6e.zip kernel_goldelico_gta04-1bf3c840b8061c526c0f442d9697311572d9cc6e.tar.gz kernel_goldelico_gta04-1bf3c840b8061c526c0f442d9697311572d9cc6e.tar.bz2 | |
Merge branch 'master' into mainline
Conflicts:
drivers/mmc/core/core.c
drivers/pwm/Kconfig
drivers/pwm/Makefile
Diffstat (limited to 'sound/soc/omap/Kconfig')
| -rw-r--r-- | sound/soc/omap/Kconfig | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sound/soc/omap/Kconfig b/sound/soc/omap/Kconfig index f2561d2..365267f 100644 --- a/sound/soc/omap/Kconfig +++ b/sound/soc/omap/Kconfig @@ -103,7 +103,7 @@ 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 SND_SOC_HDMI_CODEC select OMAP4_DSS_HDMI_AUDIO help Say Y if you want to add support for SoC HDMI audio on Texas Instruments |