aboutsummaryrefslogtreecommitdiff
path: root/arch/arm/mach-omap2
diff options
context:
space:
mode:
authorArnd Bergmann <arnd@arndb.de>2013-06-03 15:55:41 +0200
committerArnd Bergmann <arnd@arndb.de>2013-07-05 23:07:38 +0200
commit896eba3ba41e1a978e9e47cf2837ef8963996bca (patch)
tree30b1053e19387de6e441982bfbff685f6f8efc1a /arch/arm/mach-omap2
parent9f310dedfecdf53974e6e7c21d8d4dc7e8ab8c14 (diff)
ARM: omap5: omap5 has SCU and TWD
These are selected by omap4 but used in common omap4/5 SMP code, so building an omap5-only kernel is actually broken without this patch. Signed-off-by: Arnd Bergmann <arnd@arndb.de> Cc: Tony Lindgren <tony@atomide.com>
Diffstat (limited to 'arch/arm/mach-omap2')
-rw-r--r--arch/arm/mach-omap2/Kconfig2
1 files changed, 2 insertions, 0 deletions
diff --git a/arch/arm/mach-omap2/Kconfig b/arch/arm/mach-omap2/Kconfig
index 1fdb4621659..1f8127afa74 100644
--- a/arch/arm/mach-omap2/Kconfig
+++ b/arch/arm/mach-omap2/Kconfig
@@ -110,6 +110,8 @@ config SOC_OMAP5
select ARM_CPU_SUSPEND if PM
select ARM_GIC
select CPU_V7
+ select HAVE_ARM_SCU if SMP
+ select HAVE_ARM_TWD if LOCAL_TIMERS
select HAVE_SMP
select COMMON_CLK
select HAVE_ARM_ARCH_TIMER