summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndy Green <andy.green@linaro.org>2012-03-21 12:26:30 +0800
committerAndy Green <andy.green@linaro.org>2012-04-06 14:03:33 +0800
commit1c4d1004df6a68d366146a8a431eade901bc0dfb (patch)
tree1dbe2955090400fe7b7b44b7e9f250a8b71dff00
parent7468dd97ae242ed26546f2002ed3fb0be524a9dc (diff)
config omapdcetilt-3.3-omap5-eng-18
OMAP_DCE has to be a module at the moment. It races with rpmsg virtio bus registration otherwise. Signed-off-by: Andy Green <andy.green@linaro.org>
-rw-r--r--arch/arm/configs/omap_5430evm_defconfig6
1 files changed, 5 insertions, 1 deletions
diff --git a/arch/arm/configs/omap_5430evm_defconfig b/arch/arm/configs/omap_5430evm_defconfig
index b164bbb53d3..a5c673b8a28 100644
--- a/arch/arm/configs/omap_5430evm_defconfig
+++ b/arch/arm/configs/omap_5430evm_defconfig
@@ -24,7 +24,6 @@ CONFIG_GPIO_PCA953X=y
CONFIG_OMAP5_SEVM_PALMAS=y
CONFIG_OMAP_MUX_DEBUG=y
CONFIG_OMAP_SCM_DEV=y
-CONFIG_OMAP_MBOX_FWK=y
# CONFIG_ARCH_OMAP2 is not set
# CONFIG_ARCH_OMAP3 is not set
CONFIG_ARCH_OMAP5=y
@@ -198,14 +197,19 @@ CONFIG_LEDS_GPIO=y
CONFIG_LEDS_TRIGGER_HEARTBEAT=y
CONFIG_RTC_CLASS=y
CONFIG_RTC_DRV_TWL4030=y
+CONFIG_VIRTIO_MMIO=y
CONFIG_STAGING=y
CONFIG_DRM_OMAP=y
CONFIG_THERMAL_FRAMEWORK=y
CONFIG_OMAP_THERMAL=y
CONFIG_OMAP_DIE_GOVERNOR=y
CONFIG_OMAP_GPU_GOVERNOR=y
+CONFIG_DRM_OMAP_DCE=m
CONFIG_HWSPINLOCK_OMAP=y
+CONFIG_OMAP_IOVMM=y
+CONFIG_OMAP_REMOTEPROC=y
CONFIG_OMAP_REMOTEPROC_DSP=y
+CONFIG_VIRT_DRIVERS=y
CONFIG_EXT2_FS=y
CONFIG_EXT3_FS=y
# CONFIG_EXT3_DEFAULTS_TO_ORDERED is not set