Merge git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6

[deliverable/linux.git] / arch / sparc / kernel / apc.c

diff --git a/arch/sparc/kernel/apc.c b/arch/sparc/kernel/apc.c
index 348fa1aeabce586fd16ff03fcc89689d20358683..eefda32b595ef6ff1344d21ebc664ca4a7f9f0fa 100644 (file)
--- a/arch/sparc/kernel/apc.c
+++ b/arch/sparc/kernel/apc.c
@@ -20,6 +20,7 @@
 #include <asm/uaccess.h>
 #include <asm/auxio.h>
 #include <asm/apc.h>
+#include <asm/processor.h>
 
 /* Debugging
  * 
@@ -158,7 +159,7 @@ static int apc_probe(struct platform_device *op)
 
        /* Assign power management IDLE handler */
        if (!apc_no_idle)
-               pm_idle = apc_swift_idle;       
+               sparc_idle = apc_swift_idle;
 
        printk(KERN_INFO "%s: power management initialized%s\n", 
               APC_DEVNAME, apc_no_idle ? " (CPU idle disabled)" : "");