diff options
| author | Shawn Guo <shawn.guo@linaro.org> | 2013-04-01 16:29:56 +0800 |
|---|---|---|
| committer | Shawn Guo <shawn.guo@linaro.org> | 2013-04-01 16:29:56 +0800 |
| commit | 3ed628a8122112ee796cd643e2478c4a6def234c (patch) | |
| tree | 1e5e352eb501a2afa173989415a8b4896d4999a5 /arch/arm/mach-spear13xx | |
| parent | 07961ac7c0ee8b546658717034fe692fd12eefa9 (diff) | |
| parent | da4a686a2cfb077a8bfc1697f597e7f86235b822 (diff) | |
| download | talos-op-linux-3ed628a8122112ee796cd643e2478c4a6def234c.tar.gz talos-op-linux-3ed628a8122112ee796cd643e2478c4a6def234c.zip | |
Merge remote-tracking branch 'arm-soc/clksrc/cleanup' into mxs/cleanup
Diffstat (limited to 'arch/arm/mach-spear13xx')
| -rw-r--r-- | arch/arm/mach-spear13xx/spear13xx.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/arm/mach-spear13xx/spear13xx.c b/arch/arm/mach-spear13xx/spear13xx.c index c7d2b4a8d8cc..25a10191b021 100644 --- a/arch/arm/mach-spear13xx/spear13xx.c +++ b/arch/arm/mach-spear13xx/spear13xx.c @@ -15,12 +15,12 @@ #include <linux/amba/pl022.h> #include <linux/clk.h> +#include <linux/clocksource.h> #include <linux/dw_dmac.h> #include <linux/err.h> #include <linux/of.h> #include <asm/hardware/cache-l2x0.h> #include <asm/mach/map.h> -#include <asm/smp_twd.h> #include <mach/dma.h> #include <mach/generic.h> #include <mach/spear.h> @@ -179,5 +179,5 @@ void __init spear13xx_timer_init(void) clk_put(pclk); spear_setup_of_timer(); - twd_local_timer_of_register(); + clocksource_of_init(); } |
