diff options
| author | Rob Herring <robh@kernel.org> | 2014-02-01 17:35:44 -0500 |
|---|---|---|
| committer | Olof Johansson <olof@lixom.net> | 2014-02-02 22:52:53 -0500 |
| commit | 8b7dfa7dc701a27ac8ea4c4dfc0dbc8dce4825de (patch) | |
| tree | 688be98518322a77ac1fddf3e9ea6184e541d3e9 /arch | |
| parent | e803d988662ff365c2ed3c2d10a0aad811c1f492 (diff) | |
ARM: fix HAVE_ARM_TWD selection for OMAP and shmobile
The selection of HAVE_ARM_TWD for OMAP and shmobile depend on LOCAL_TIMER
which no longer exists. They should depend on SMP instead.
Cc: Tony Lindgren <tony@atomide.com>
Cc: Simon Horman <horms@verge.net.au>
Cc: Magnus Damm <magnus.damm@gmail.com>
Signed-off-by: Rob Herring <robh@kernel.org>
Signed-off-by: Olof Johansson <olof@lixom.net>
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/arm/mach-omap2/Kconfig | 2 | ||||
| -rw-r--r-- | arch/arm/mach-shmobile/Kconfig | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/arch/arm/mach-omap2/Kconfig b/arch/arm/mach-omap2/Kconfig index 653b489479e0..e2ce4f8366a7 100644 --- a/arch/arm/mach-omap2/Kconfig +++ b/arch/arm/mach-omap2/Kconfig | |||
| @@ -54,7 +54,7 @@ config SOC_OMAP5 | |||
| 54 | select ARM_GIC | 54 | select ARM_GIC |
| 55 | select CPU_V7 | 55 | select CPU_V7 |
| 56 | select HAVE_ARM_SCU if SMP | 56 | select HAVE_ARM_SCU if SMP |
| 57 | select HAVE_ARM_TWD if LOCAL_TIMERS | 57 | select HAVE_ARM_TWD if SMP |
| 58 | select HAVE_SMP | 58 | select HAVE_SMP |
| 59 | select HAVE_ARM_ARCH_TIMER | 59 | select HAVE_ARM_ARCH_TIMER |
| 60 | select ARM_ERRATA_798181 if SMP | 60 | select ARM_ERRATA_798181 if SMP |
diff --git a/arch/arm/mach-shmobile/Kconfig b/arch/arm/mach-shmobile/Kconfig index 338640631e08..05fa505df585 100644 --- a/arch/arm/mach-shmobile/Kconfig +++ b/arch/arm/mach-shmobile/Kconfig | |||
| @@ -8,7 +8,7 @@ config ARCH_SHMOBILE_MULTI | |||
| 8 | select CPU_V7 | 8 | select CPU_V7 |
| 9 | select GENERIC_CLOCKEVENTS | 9 | select GENERIC_CLOCKEVENTS |
| 10 | select HAVE_ARM_SCU if SMP | 10 | select HAVE_ARM_SCU if SMP |
| 11 | select HAVE_ARM_TWD if LOCAL_TIMERS | 11 | select HAVE_ARM_TWD if SMP |
| 12 | select HAVE_SMP | 12 | select HAVE_SMP |
| 13 | select ARM_GIC | 13 | select ARM_GIC |
| 14 | select MIGHT_HAVE_CACHE_L2X0 | 14 | select MIGHT_HAVE_CACHE_L2X0 |