Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc

[~andy/linux] / arch / arm / mach-spear6xx / spear6xx.c

diff --git a/arch/arm/mach-spear6xx/spear6xx.c b/arch/arm/mach-spear6xx/spear6xx.c
index 981812961ac7358d84c479a86028b3d00c3d9a89..e0f6628c8b2c878155fc311acad938b15a3d56d4 100644 (file)
--- a/arch/arm/mach-spear6xx/spear6xx.c
+++ b/arch/arm/mach-spear6xx/spear6xx.c
@@ -148,7 +148,7 @@ void __init spear6xx_map_io(void)
        iotable_init(spear6xx_io_desc, ARRAY_SIZE(spear6xx_io_desc));
 
        /* This will initialize clock framework */
-       clk_init();
+       spear6xx_clk_init();
 }
 
 static void __init spear6xx_timer_init(void)