X-Git-Url: http://git.osdn.net/view?a=blobdiff_plain;f=arch%2Farm%2Fmach-mvebu%2Farmada-370-xp.c;h=4ea03ad4117971060d3807d7a5f88f3460a02ef6;hb=573145f08c2b92c45498468afbbba909f6ce6135;hp=97cbb802191930d21c64532d93e3a4ea2a2594af;hpb=bb93109e1544e2a4d12c2c35bf1af84c25a2699d;p=android-x86%2Fkernel.git

diff --git a/arch/arm/mach-mvebu/armada-370-xp.c b/arch/arm/mach-mvebu/armada-370-xp.c
index 97cbb8021919..4ea03ad41179 100644
--- a/arch/arm/mach-mvebu/armada-370-xp.c
+++ b/arch/arm/mach-mvebu/armada-370-xp.c
@@ -18,7 +18,7 @@
 #include <linux/of_address.h>
 #include <linux/of_platform.h>
 #include <linux/io.h>
-#include <linux/time-armada-370-xp.h>
+#include <linux/clocksource.h>
 #include <linux/dma-mapping.h>
 #include <linux/mbus.h>
 #include <asm/hardware/cache-l2x0.h>
@@ -69,7 +69,7 @@ static void __init armada_370_xp_mbus_init(void)
 static void __init armada_370_xp_timer_and_clk_init(void)
 {
 	of_clk_init(NULL);
-	armada_370_xp_timer_init();
+	clocksource_of_init();
 	coherency_init();
 	armada_370_xp_mbus_init();
 #ifdef CONFIG_CACHE_L2X0