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/mach-omap2 | |
| parent | e9069cf8b74b50d804fd540a9fd1383504f4af93 (diff) | |
| parent | 4f0f234fce1d263cc9881456352e8fd56ead0514 (diff) | |
| download | lwn-6b5606e0834bb173a8ce3505edec078f135e9f6c.tar.gz lwn-6b5606e0834bb173a8ce3505edec078f135e9f6c.zip | |
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/mach-omap2')
| -rw-r--r-- | arch/arm/mach-omap2/timer.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/mach-omap2/timer.c b/arch/arm/mach-omap2/timer.c index 2bdd4cf17a8f..4fd80257c73e 100644 --- a/arch/arm/mach-omap2/timer.c +++ b/arch/arm/mach-omap2/timer.c @@ -597,7 +597,7 @@ void __init omap4_local_timer_init(void) int err; if (of_have_populated_dt()) { - twd_local_timer_of_register(); + clocksource_of_init(); return; } |