upgrade to linux 2.6.10-1.12_FC2

[linux-2.6.git] / arch / ppc64 / kernel / idle.c

diff --git a/arch/ppc64/kernel/idle.c b/arch/ppc64/kernel/idle.c
index 62e509d..ebed297 100644 (file)
--- a/arch/ppc64/kernel/idle.c
+++ b/arch/ppc64/kernel/idle.c
@@ -22,6 +22,7 @@
 #include <linux/cpu.h>
 #include <linux/module.h>
 #include <linux/sysctl.h>
+#include <linux/smp.h>
 
 #include <asm/system.h>
 #include <asm/processor.h>
@@ -363,12 +364,13 @@ int idle_setup(void)
                }
        }
 #endif /* CONFIG_PPC_PSERIES */
-#ifdef CONFIG_PPC_PMAC
-       if (systemcfg->platform == PLATFORM_POWERMAC) {
+#ifndef CONFIG_PPC_ISERIES
+       if (systemcfg->platform == PLATFORM_POWERMAC ||
+           systemcfg->platform == PLATFORM_MAPLE) {
                printk(KERN_INFO "Using native/NAP idle loop\n");
                idle_loop = native_idle;
        }
-#endif /* CONFIG_PPC_PMAC */
+#endif /* CONFIG_PPC_ISERIES */
 
        return 1;
 }