diff options
author | Felipe Balbi <balbi@ti.com> | 2015-10-02 20:33:36 +0100 |
---|---|---|
committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2015-10-03 16:36:44 +0100 |
commit | 63c27ae7981e5c28abfe97ca5f6ef92a5070ce7a (patch) | |
tree | 5628ad838fb38f75898b0b9c8e09649cfbd7406b /arch/arm/Kconfig | |
parent | 6ff0966052c46efb53980b8a1add2e7b49c9f560 (diff) | |
download | linux-63c27ae7981e5c28abfe97ca5f6ef92a5070ce7a.tar.bz2 |
ARM: 8434/2: Revert "7655/1: smp_twd: make twd_local_timer_of_register() no-op for nosmp"
This reverts commit 904464b91eca8c665acea033489225af02eeb75a.
The problem pointed out by commit 904464b91eca ("ARM: 7655/1:
smp_twd: make twd_local_timer_of_register() no-op for nosmp")
doesn't exist anymore.
We can safely boot with nosmp and the warning won't show up.
The other side benefit of this patch is that TWD has a chance
to probe on single-core A9 systems such as AM437x which sport
TWD.
While at that, also drop SMP dependency from TWD's Kconfig entry.
Cc: Shawn Guo <shawn.guo@linaro.org>
Cc: Dirk Behme <dirk.behme@de.bosch.com>
Acked-by: Tony Lindgren <tony@atomide.com>
Signed-off-by: Felipe Balbi <balbi@ti.com>
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
Diffstat (limited to 'arch/arm/Kconfig')
-rw-r--r-- | arch/arm/Kconfig | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig index 72ad724c67ae..f7bb1b73fd22 100644 --- a/arch/arm/Kconfig +++ b/arch/arm/Kconfig @@ -1410,7 +1410,6 @@ config HAVE_ARM_ARCH_TIMER config HAVE_ARM_TWD bool - depends on SMP select CLKSRC_OF if OF help This options enables support for the ARM timer and watchdog unit |