diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2013-04-09 17:50:55 +0200 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2013-04-09 17:50:55 +0200 |
| commit | 42d96abbe0d9a0a0662c0c0d494e64e983d0e68a (patch) | |
| tree | c951ed6bcdc9192e3deb8120788a3e4a6c4c3c78 /arch/arm/mach-ux500/timer.c | |
| parent | 07961ac7c0ee8b546658717034fe692fd12eefa9 (diff) | |
| parent | e933a1a12a02f42e0013cda87bba37ccb59efc47 (diff) | |
| download | talos-obmc-linux-42d96abbe0d9a0a0662c0c0d494e64e983d0e68a.tar.gz talos-obmc-linux-42d96abbe0d9a0a0662c0c0d494e64e983d0e68a.zip | |
Merge branch 'mxs/cleanup' into next/dt2
This is a dependency for mxs/dt
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Diffstat (limited to 'arch/arm/mach-ux500/timer.c')
| -rw-r--r-- | arch/arm/mach-ux500/timer.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/arch/arm/mach-ux500/timer.c b/arch/arm/mach-ux500/timer.c index a6af0b8732ba..d07bbe7f04a6 100644 --- a/arch/arm/mach-ux500/timer.c +++ b/arch/arm/mach-ux500/timer.c @@ -7,6 +7,7 @@ #include <linux/io.h> #include <linux/errno.h> #include <linux/clksrc-dbx500-prcmu.h> +#include <linux/clocksource.h> #include <linux/of.h> #include <linux/of_address.h> #include <linux/platform_data/clocksource-nomadik-mtu.h> @@ -32,7 +33,7 @@ static void __init ux500_twd_init(void) twd_local_timer = &u8500_twd_local_timer; if (of_have_populated_dt()) - twd_local_timer_of_register(); + clocksource_of_init(); else { err = twd_local_timer_register(twd_local_timer); if (err) |
