Revert to Fedora kernel-2.6.17-1.2187_FC5 patched with vs2.0.2.1; there are too many...

[linux-2.6.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 8b4a4ee..55ed771 100644 (file)
--- a/arch/powerpc/kernel/cpu_setup_6xx.S
+++ b/arch/powerpc/kernel/cpu_setup_6xx.S
@@ -9,6 +9,7 @@
  *
  */
 
+#include <linux/config.h>
 #include <asm/processor.h>
 #include <asm/page.h>
 #include <asm/cputable.h>
@@ -209,11 +210,9 @@ 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