This commit was generated by cvs2svn to compensate for changes in r1129,

[linux-2.6.git] / arch / ppc / kernel / idle_6xx.S

diff --git a/arch/ppc/kernel/idle_6xx.S b/arch/ppc/kernel/idle_6xx.S
index 608f71c..1a2194c 100644 (file)
--- a/arch/ppc/kernel/idle_6xx.S
+++ b/arch/ppc/kernel/idle_6xx.S
@@ -20,7 +20,7 @@
 #include <asm/cputable.h>
 #include <asm/thread_info.h>
 #include <asm/ppc_asm.h>
-#include <asm/offsets.h>
+#include <asm/asm-offsets.h>
 
 #undef DEBUG
 
@@ -79,12 +79,12 @@ BEGIN_FTR_SECTION
        /* Now check if user or arch enabled NAP mode */
        lis     r4,powersave_nap@ha
        lwz     r4,powersave_nap@l(r4)
-       cmpi    0,r4,0
+       cmpwi   0,r4,0
        beq     1f
        lis     r3,HID0_NAP@h
 1:     
 END_FTR_SECTION_IFSET(CPU_FTR_CAN_NAP)
-       cmpi    0,r3,0
+       cmpwi   0,r3,0
        beqlr
 
        /* Clear MSR:EE */
@@ -133,7 +133,7 @@ BEGIN_FTR_SECTION
        /* Go to low speed mode on some 750FX */
        lis     r4,powersave_lowspeed@ha
        lwz     r4,powersave_lowspeed@l(r4)
-       cmpi    0,r4,0
+       cmpwi   0,r4,0
        beq     1f
        mfspr   r4,SPRN_HID1
        oris    r4,r4,0x0001