aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrey Konovalov <andrey.konovalov@linaro.org>2012-05-17 17:01:22 +0400
committerAndrey Konovalov <andrey.konovalov@linaro.org>2012-05-17 17:54:51 +0400
commit4ba37aeae9a6bbf68aff40cac17e25caebb133a4 (patch)
treec63a784f2e3e309db3389f748b33abdc8328ee43
parent19d399207f66dad63ba5b5823467083ebc0cbeac (diff)
CONFIG: Disable ARCH_OMAP3 in omap4_defconfig to enable Gatortracking-unsorted-3.4-2012.05-1tracking-unsorted-3.4-2012.05-0
Gator requires CONFIG_HW_PERF_EVENTS which depend on CPU_HAS_PMU, and the latter depends on (!ARCH_OMAP3 || OMAP3_EMU) Signed-off-by: Andrey Konovalov <andrey.konovalov@linaro.org>
-rw-r--r--arch/arm/configs/omap4_defconfig1
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/arm/configs/omap4_defconfig b/arch/arm/configs/omap4_defconfig
index b29cb5763938..942340723f79 100644
--- a/arch/arm/configs/omap4_defconfig
+++ b/arch/arm/configs/omap4_defconfig
@@ -131,6 +131,7 @@ CONFIG_OMAP_DM_TIMER=y
CONFIG_OMAP_PM_NOOP=y
CONFIG_MACH_OMAP_GENERIC=y
CONFIG_ARCH_OMAP2PLUS_TYPICAL=y
+CONFIG_ARCH_OMAP3=n
CONFIG_ARCH_OMAP4=y
CONFIG_OMAP_PACKAGE_CBL=y
CONFIG_OMAP_PACKAGE_CBS=y