diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2013-04-08 18:34:19 +0200 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2013-04-08 18:34:19 +0200 |
| commit | 6b5606e0834bb173a8ce3505edec078f135e9f6c (patch) | |
| tree | 9f3bdc09be01e14fb68368b1c111a04cc570518f /arch/arm/Kconfig | |
| parent | e9069cf8b74b50d804fd540a9fd1383504f4af93 (diff) | |
| parent | 4f0f234fce1d263cc9881456352e8fd56ead0514 (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/Kconfig | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig index c6a82c74fcb..eb91022b90b 100644 --- a/arch/arm/Kconfig +++ b/arch/arm/Kconfig @@ -1598,6 +1598,7 @@ 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 |