Merge branch 'smp-hotplug-for-linus' of git://git.kernel.org/pub/scm/linux/kernel...

[deliverable/linux.git] / arch / arm / mach-omap2 / pm-debug.c

diff --git a/arch/arm/mach-omap2/pm-debug.c b/arch/arm/mach-omap2/pm-debug.c
index e2c291f52f925b360253add1dc7f4921233bec8b..1edd000a81439eb6e7648dcefeeb69ec5ab01b42 100644 (file)
--- a/arch/arm/mach-omap2/pm-debug.c
+++ b/arch/arm/mach-omap2/pm-debug.c
@@ -83,10 +83,8 @@ static int clkdm_dbg_show_counter(struct clockdomain *clkdm, void *user)
                strncmp(clkdm->name, "dpll", 4) == 0)
                return 0;
 
-       seq_printf(s, "%s->%s (%d)", clkdm->name,
-                       clkdm->pwrdm.ptr->name,
-                       atomic_read(&clkdm->usecount));
-       seq_printf(s, "\n");
+       seq_printf(s, "%s->%s (%d)\n", clkdm->name, clkdm->pwrdm.ptr->name,
+                  clkdm->usecount);
 
        return 0;
 }
@@ -279,6 +277,6 @@ static int __init pm_dbg_init(void)
 
        return 0;
 }
-arch_initcall(pm_dbg_init);
+omap_arch_initcall(pm_dbg_init);
 
 #endif