aboutsummaryrefslogtreecommitdiffstats
path: root/arch/arm/Kconfig
diff options
context:
space:
mode:
authorArnd Bergmann <arnd@arndb.de>2013-04-08 12:34:19 -0400
committerArnd Bergmann <arnd@arndb.de>2013-04-08 12:34:19 -0400
commit6b5606e0834bb173a8ce3505edec078f135e9f6c (patch)
tree9f3bdc09be01e14fb68368b1c111a04cc570518f /arch/arm/Kconfig
parente9069cf8b74b50d804fd540a9fd1383504f4af93 (diff)
parent4f0f234fce1d263cc9881456352e8fd56ead0514 (diff)
Merge branch 'zynq/clksrc/cleanup' of git://git.xilinx.com/linux-xlnx into next/drivers
From Michal Simek <michal.simek@xilinx.com>: * 'zynq/clksrc/cleanup' of git://git.xilinx.com/linux-xlnx: arm: zynq: Move timer to generic location arm: zynq: Do not use xilinx specific function names arm: zynq: Move timer to clocksource interface arm: zynq: Use standard timer binding Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Diffstat (limited to 'arch/arm/Kconfig')
-rw-r--r--arch/arm/Kconfig1
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig
index c6a82c74fcbb..eb91022b90ba 100644
--- a/arch/arm/Kconfig
+++ b/arch/arm/Kconfig
@@ -1598,6 +1598,7 @@ config HAVE_ARM_ARCH_TIMER
1598config HAVE_ARM_TWD 1598config HAVE_ARM_TWD
1599 bool 1599 bool
1600 depends on SMP 1600 depends on SMP
1601 select CLKSRC_OF if OF
1601 help 1602 help
1602 This options enables support for the ARM timer and watchdog unit 1603 This options enables support for the ARM timer and watchdog unit
1603 1604