Merge ../linux-2.6

2 files changed, 4 insertions, 9 deletions

diff --git a/arch/powerpc/platforms/powermac/feature.c b/arch/powerpc/platforms/powermac/feature.c
index c8b4a2b115a9..e49eddd5042d 100644
--- a/arch/powerpc/platforms/powermac/feature.c
+++ b/arch/powerpc/platforms/powermac/feature.c
@@ -2489,9 +2489,7 @@ found:
                         pmac_mb.model_id = PMAC_TYPE_COMET;
                 iounmap(mach_id_ptr);
         }
-#endif /* CONFIG_POWER4 */
 
-#ifdef CONFIG_6xx
         /* Set default value of powersave_nap on machines that support it.
          * It appears that uninorth rev 3 has a problem with it, we don't
          * enable it on those. In theory, the flush-on-lock property is
@@ -2520,10 +2518,11 @@ found:
          * NAP mode
          */
         powersave_lowspeed = 1;
-#endif /* CONFIG_6xx */
-#ifdef CONFIG_POWER4
+
+#else /* CONFIG_POWER4 */
         powersave_nap = 1;
-#endif
+#endif  /* CONFIG_POWER4 */
+
         /* Check for "mobile" machine */
         if (model && (strncmp(model, "PowerBook", 9) == 0
                    || strncmp(model, "iBook", 5) == 0))
diff --git a/arch/powerpc/platforms/powermac/setup.c b/arch/powerpc/platforms/powermac/setup.c
index 97c54e19c1b5..385aab90c4d2 100644
--- a/arch/powerpc/platforms/powermac/setup.c
+++ b/arch/powerpc/platforms/powermac/setup.c
@@ -621,10 +621,6 @@ static void __init pmac_init_early(void)
         /* Probe motherboard chipset */
         pmac_feature_init();
 
-        /* We can NAP */
-        powersave_nap = 1;
-        printk(KERN_INFO "Using native/NAP idle loop\n");
-
         /* Initialize debug stuff */
         udbg_scc_init(!!strstr(cmd_line, "sccdbg"));
         udbg_adb_init(!!strstr(cmd_line, "btextdbg"));