summaryrefslogtreecommitdiffstats
path: root/arch
diff options
context:
space:
mode:
authorHeiko Stuebner <heiko@sntech.de>2013-09-29 16:15:35 +0200
committerHeiko Stuebner <heiko@sntech.de>2013-10-14 21:01:12 +0200
commitf350f823867e82d885278346a75ed33b63248c42 (patch)
treeee43aafe13f214a316bd86dbee4fa036228aeaf8 /arch
parentLinux 3.12-rc2 (diff)
downloadlinux-f350f823867e82d885278346a75ed33b63248c42.tar.xz
linux-f350f823867e82d885278346a75ed33b63248c42.zip
ARM: rockchip: fix wrong use of non-existent CONFIG_LOCAL_TIMERS
CONFIG_LOCAL_TIMERS was removed in february, so the twd never gets selected. Fix this by making the twd depend on SMP directly. Signed-off-by: Heiko Stuebner <heiko@sntech.de>
Diffstat (limited to 'arch')
-rw-r--r--arch/arm/mach-rockchip/Kconfig3
1 files changed, 1 insertions, 2 deletions
diff --git a/arch/arm/mach-rockchip/Kconfig b/arch/arm/mach-rockchip/Kconfig
index 25ee12b21f01..a8487337344a 100644
--- a/arch/arm/mach-rockchip/Kconfig
+++ b/arch/arm/mach-rockchip/Kconfig
@@ -5,9 +5,8 @@ config ARCH_ROCKCHIP
select ARCH_REQUIRE_GPIOLIB
select ARM_GIC
select CACHE_L2X0
- select HAVE_ARM_TWD if LOCAL_TIMERS
+ select HAVE_ARM_TWD if SMP
select HAVE_SMP
- select LOCAL_TIMERS if SMP
select COMMON_CLK
select GENERIC_CLOCKEVENTS
select DW_APB_TIMER_OF