summaryrefslogtreecommitdiff
path: root/arch
diff options
context:
space:
mode:
authorAndy Green <andy.green@linaro.org>2012-06-22 09:13:53 +0800
committerAndy Green <andy.green@linaro.org>2012-06-22 10:06:16 +0800
commite1647d0b7bc054eaeacb07cb366054922b640a74 (patch)
tree96765a9cfbeda8cf28076c95c48667af5f9d3381 /arch
parent6379273e67b86a4e419ed7be3a714f68b51cd409 (diff)
downloadpanda-e1647d0b7bc054eaeacb07cb366054922b640a74.tar.gz
config hdmi audio
Signed-off-by: Andy Green <andy.green@linaro.org>
Diffstat (limited to 'arch')
-rw-r--r--arch/arm/configs/omap4plus_defconfig5
1 files changed, 2 insertions, 3 deletions
diff --git a/arch/arm/configs/omap4plus_defconfig b/arch/arm/configs/omap4plus_defconfig
index 7e3d3d41e1b..8f983ec9c47 100644
--- a/arch/arm/configs/omap4plus_defconfig
+++ b/arch/arm/configs/omap4plus_defconfig
@@ -31,7 +31,6 @@ CONFIG_OMAP_MBOX_FWK=y
# CONFIG_MACH_OMAP_4430SDP is not set
CONFIG_SECURE_REGS=y
CONFIG_OMAP4_ERRATA_I688=y
-CONFIG_OMAP_ALLOW_OSWR=y
CONFIG_ARM_THUMBEE=y
CONFIG_PL310_ERRATA_753970=y
CONFIG_PL310_ERRATA_769419=y
@@ -138,7 +137,7 @@ CONFIG_OMAP2_DSS_COLLECT_IRQ_STATS=y
CONFIG_OMAP2_DSS_RFBI=y
CONFIG_OMAP2_DSS_DSI=y
CONFIG_PANEL_GENERIC_DPI=y
-CONFIG_PANEL_DVI=y
+CONFIG_PANEL_TFP410=y
CONFIG_FRAMEBUFFER_CONSOLE=y
CONFIG_FONTS=y
CONFIG_FONT_8x8=y
@@ -157,7 +156,7 @@ CONFIG_SND_SOC=y
CONFIG_SND_OMAP_SOC=y
CONFIG_SND_OMAP_SOC_OMAP_ABE_TWL6040=y
CONFIG_SND_OMAP_SOC_SDP4430=y
-CONFIG_SND_OMAP_SOC_OMAP4_HDMI=y
+CONFIG_SND_OMAP_SOC_OMAP_HDMI=y
CONFIG_HIDRAW=y
CONFIG_USB_HIDDEV=y
CONFIG_HID_APPLE=y