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-highbank | |
| 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-highbank')
| -rw-r--r-- | arch/arm/mach-highbank/highbank.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/arch/arm/mach-highbank/highbank.c b/arch/arm/mach-highbank/highbank.c index a4f9f50247d4..76c1170b3528 100644 --- a/arch/arm/mach-highbank/highbank.c +++ b/arch/arm/mach-highbank/highbank.c @@ -32,7 +32,6 @@ #include <asm/cacheflush.h> #include <asm/cputype.h> #include <asm/smp_plat.h> -#include <asm/smp_twd.h> #include <asm/hardware/arm_timer.h> #include <asm/hardware/timer-sp.h> #include <asm/hardware/cache-l2x0.h> @@ -119,10 +118,10 @@ static void __init highbank_timer_init(void) sp804_clocksource_and_sched_clock_init(timer_base + 0x20, "timer1"); sp804_clockevents_init(timer_base, irq, "timer0"); - twd_local_timer_of_register(); - arch_timer_of_register(); arch_timer_sched_clock_init(); + + clocksource_of_init(); } static void highbank_power_off(void) |
