Merge tag 'v2.6.38' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6

[mv-sheeva.git] / arch / arm / mach-omap2 / clock3xxx.c

diff --git a/arch/arm/mach-omap2/clock3xxx.c b/arch/arm/mach-omap2/clock3xxx.c
index a447c4d2c28a6c604d5cf8c3d285695cde158022..e9f66b6dec18e1657e77c6c4fbbb6bf46913c00b 100644 (file)
--- a/arch/arm/mach-omap2/clock3xxx.c
+++ b/arch/arm/mach-omap2/clock3xxx.c
@@ -25,9 +25,9 @@
 
 #include "clock.h"
 #include "clock3xxx.h"
-#include "prm.h"
+#include "prm2xxx_3xxx.h"
 #include "prm-regbits-34xx.h"
-#include "cm.h"
+#include "cm2xxx_3xxx.h"
 #include "cm-regbits-34xx.h"
 
 /*
@@ -94,7 +94,7 @@ static int __init omap3xxx_clk_arch_init(void)
 
        ret = omap2_clk_switch_mpurate_at_boot("dpll1_ck");
        if (!ret)
-               omap2_clk_print_new_rates("osc_sys_ck", "arm_fck", "core_ck");
+               omap2_clk_print_new_rates("osc_sys_ck", "core_ck", "arm_fck");
 
        return ret;
 }