Merge branch 'for-2.6.24' of master.kernel.org:/pub/scm/linux/kernel/git/galak/powerp...

[linux-2.6-omap-h63xx.git] / arch / powerpc / kernel / cpu_setup_6xx.S

diff --git a/arch/powerpc/kernel/cpu_setup_6xx.S b/arch/powerpc/kernel/cpu_setup_6xx.S
index 55ed7716636f45d02135f46728a2fab8beb07c97..f1ee0b3f78f26fc1e0364244b2819486e637191f 100644 (file)
--- a/arch/powerpc/kernel/cpu_setup_6xx.S
+++ b/arch/powerpc/kernel/cpu_setup_6xx.S
@@ -9,7 +9,6 @@
  *
  */
 
-#include <linux/config.h>
 #include <asm/processor.h>
 #include <asm/page.h>
 #include <asm/cputable.h>
@@ -114,7 +113,7 @@ setup_604_hid0:
  * around #3 and with the same fix we use. We may want to
  * check if the CPU is using 60x bus mode in which case
  * the workaround for errata #4 is useless. Also, we may
- * want to explicitely clear HID0_NOPDST as this is not
+ * want to explicitly clear HID0_NOPDST as this is not
  * needed once we have applied workaround #5 (though it's
  * not set by Apple's firmware at least).
  */
@@ -210,9 +209,11 @@ setup_745x_specifics:
         * the firmware. If any, we disable NAP capability as
         * it's known to be bogus on rev 2.1 and earlier
         */
+BEGIN_FTR_SECTION
        mfspr   r11,SPRN_L3CR
        andis.  r11,r11,L3CR_L3E@h
        beq     1f
+END_FTR_SECTION_IFSET(CPU_FTR_L3CR)
        lwz     r6,CPU_SPEC_FEATURES(r5)
        andi.   r0,r6,CPU_FTR_L3_DISABLE_NAP
        beq     1f