diff options
| author | Dan Willemsen <dwillemsen@nvidia.com> | 2013-08-19 21:35:31 -0700 |
|---|---|---|
| committer | Dan Willemsen <dwillemsen@nvidia.com> | 2013-08-30 19:34:35 -0700 |
| commit | ddb49eadadb47df43a5cec0bc3a39cd5ee718121 (patch) | |
| tree | c20462f5a8683c02db64a24e7ff20f4ca7a8b76d /arch/arm/mach-ux500 | |
| parent | 5c26a8baf534001b612f9f39f1fa5075e36b6aa9 (diff) | |
Revert "ARM: smp_twd: convert to use CLKSRC_OF init"
This reverts commit da4a686a2cfb077a8bfc1697f597e7f86235b822.
Signed-off-by: Dan Willemsen <dwillemsen@nvidia.com>
Diffstat (limited to 'arch/arm/mach-ux500')
| -rw-r--r-- | arch/arm/mach-ux500/timer.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/arch/arm/mach-ux500/timer.c b/arch/arm/mach-ux500/timer.c index b6bd0efcbe64..290b9c5e5e28 100644 --- a/arch/arm/mach-ux500/timer.c +++ b/arch/arm/mach-ux500/timer.c @@ -7,7 +7,6 @@ #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> @@ -33,7 +32,7 @@ static void __init ux500_twd_init(void) twd_local_timer = &u8500_twd_local_timer; if (of_have_populated_dt()) - clocksource_of_init(); + twd_local_timer_of_register(); else { err = twd_local_timer_register(twd_local_timer); if (err) |