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

[~andy/linux] / arch / sparc / kernel / process_32.c

diff --git a/arch/sparc/kernel/process_32.c b/arch/sparc/kernel/process_32.c
index be8e862badaff0db6e4eb0ae8e9d6e93e18d429f..62eede13831a2685694986165c5ac11a36daceda 100644 (file)
--- a/arch/sparc/kernel/process_32.c
+++ b/arch/sparc/kernel/process_32.c
@@ -43,8 +43,7 @@
  * Power management idle function 
  * Set in pm platform drivers (apc.c and pmc.c)
  */
-void (*pm_idle)(void);
-EXPORT_SYMBOL(pm_idle);
+void (*sparc_idle)(void);
 
 /* 
  * Power-off handler instantiation for pm.h compliance
@@ -75,8 +74,8 @@ void cpu_idle(void)
        /* endless idle loop with no priority at all */
        for (;;) {
                while (!need_resched()) {
-                       if (pm_idle)
-                               (*pm_idle)();
+                       if (sparc_idle)
+                               (*sparc_idle)();
                        else
                                cpu_relax();
                }