aboutsummaryrefslogtreecommitdiff
path: root/arch/arm
diff options
context:
space:
mode:
authorAndy Green <andy.green@linaro.org>2011-11-13 05:56:28 +0800
committerAndy Green <andy.green@linaro.org>2011-11-19 08:55:03 +0800
commitc431fe96c70e39e01a70d87d974bae8da26ebba6 (patch)
treece4117cba9f4b96e722e7a065922f7236e6185fe /arch/arm
parent2dc2a5a0b591a02e6f55e3ff043d3a0b7c6c3ef2 (diff)
config errata 754322
Signed-off-by: Andy Green <andy.green@linaro.org>
Diffstat (limited to 'arch/arm')
-rw-r--r--arch/arm/configs/omap4_defconfig5
1 files changed, 3 insertions, 2 deletions
diff --git a/arch/arm/configs/omap4_defconfig b/arch/arm/configs/omap4_defconfig
index 84cf9ffa2d1..7401de5a5e1 100644
--- a/arch/arm/configs/omap4_defconfig
+++ b/arch/arm/configs/omap4_defconfig
@@ -34,6 +34,7 @@ CONFIG_OMAP_SCM_DEV=y
# CONFIG_ARCH_OMAP2 is not set
# CONFIG_ARCH_OMAP3 is not set
CONFIG_ARM_THUMBEE=y
+CONFIG_ARM_ERRATA_754322=y
CONFIG_NO_HZ=y
CONFIG_HIGH_RES_TIMERS=y
CONFIG_SMP=y
@@ -264,8 +265,8 @@ CONFIG_MMC_OMAP_HS=y
CONFIG_RTC_CLASS=y
CONFIG_RTC_DRV_TWL4030=y
CONFIG_STAGING=y
-CONFIG_THERMAL_FRAMEWORK=y
-CONFIG_OMAP_THERMAL=y
+CONFIG_THERMAL_FRAMEWORK=y
+CONFIG_OMAP_THERMAL=y
CONFIG_OMAP_DIE_GOVERNOR=y
CONFIG_DRM_OMAP_NUM_CRTCS=1
CONFIG_HWSPINLOCK=y