summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJorge Eduardo Candelaria <jorge.candelaria@ti.com>2010-02-23 11:22:02 -0600
committerRicardo Perez Olivares <x0081762@ti.com>2010-02-25 15:51:44 -0600
commit05582236f6d8baddf31579af4ad1842691650043 (patch)
tree5b9b579cb4abaab2a01645cea67a3104f53756ec
parentb9d26aaf1b984ff40f0b07bb5d9c20e10cb04027 (diff)
ARM: OMAP4: Enable HDMI audio by default in defconfigti-2.6.33-rc2-omap4-L24.4-p2
Update omap_4430sdp_defconfig to enable HDMI audio by default. Signed-off-by: Jorge Eduardo Candelaria <jorge.candelaria@ti.com>
-rw-r--r--arch/arm/configs/omap_4430sdp_defconfig2
-rw-r--r--sound/soc/omap/Kconfig2
2 files changed, 2 insertions, 2 deletions
diff --git a/arch/arm/configs/omap_4430sdp_defconfig b/arch/arm/configs/omap_4430sdp_defconfig
index e8c1891c520d..3aaafafe3fa8 100644
--- a/arch/arm/configs/omap_4430sdp_defconfig
+++ b/arch/arm/configs/omap_4430sdp_defconfig
@@ -1002,7 +1002,7 @@ CONFIG_SND_SOC=y
CONFIG_SND_OMAP_SOC=y
CONFIG_SND_OMAP_SOC_ABE=y
CONFIG_SND_OMAP_SOC_SDP4430=y
-# CONFIG_SND_OMAP_SOC_HDMI is not set
+CONFIG_SND_OMAP_SOC_HDMI=y
CONFIG_SND_SOC_I2C_AND_SPI=y
# CONFIG_SND_SOC_ALL_CODECS is not set
CONFIG_SND_SOC_ABE_TWL6030=y
diff --git a/sound/soc/omap/Kconfig b/sound/soc/omap/Kconfig
index ddff0ce22dd3..d3577539fea0 100644
--- a/sound/soc/omap/Kconfig
+++ b/sound/soc/omap/Kconfig
@@ -99,7 +99,7 @@ config SND_OMAP_SOC_SDP4430
config SND_OMAP_SOC_HDMI
tristate "SoC Audio support for HDMI interface on SDP4430"
- depends on SND_OMAP_SOC_SDP4430
+ depends on SND_OMAP_SOC_SDP4430 && OMAP2_DSS_HDMI
help
Say Y if you want to add support for HDMI interface on SDP4430