===== arch/ppc/kernel/idle.c 1.14 vs edited ===== --- 1.14/arch/ppc/kernel/idle.c Tue Jun 5 07:41:18 2001 +++ edited/arch/ppc/kernel/idle.c Thu Jun 7 14:12:18 2001 @@ -52,12 +52,12 @@ /* We can sleep on 603-family, 750 (G3) 74xx (G4) and some 4xx processors */ switch (_get_PVR() >> 16) { - case 3: /* 603 */ - case 6: /* 603e */ - case 7: /* 603ev */ - case 8: /* 750 */ - case 12: /* 7400 */ - case 0x800c: /* 7410 */ + case PVR_VER( PVR_603 ): /* 603 */ + case PVR_VER( PVR_603e ): /* 603e */ + case PVR_VER( PVR_603ev ): /* 603ev */ + case PVR_VER( PVR_750 ): /* 750 */ + case PVR_VER( PVR_7400 ): /* 7400 */ + case PVR_VER( PVR_7410 ): /* 7410 */ case PVR_VER( PVR_405GP ): /* 405GP */ case PVR_VER( PVR_STB03XXX ): do_power_save = 1; @@ -312,12 +312,12 @@ if (!current->need_resched) { switch (_get_PVR() >> 16) { - case 3: /* 603 */ - case 6: /* 603e */ - case 7: /* 603ev */ - case 8: /* 750 */ - case 12: /* 7400 */ - case 0x800c: /* 7410 */ + case PVR_VER( PVR_603 ): /* 603 */ + case PVR_VER( PVR_603e ): /* 603e */ + case PVR_VER( PVR_603ev ): /* 603ev */ + case PVR_VER( PVR_750 ): /* 750 */ + case PVR_VER( PVR_7400 ): /* 7400 */ + case PVR_VER( PVR_7410 ): /* 7410 */ asm("mfspr %0,1008" : "=r" (hid0) :); hid0 &= ~(HID0_NAP | HID0_SLEEP | HID0_DOZE); hid0 |= (powersave_nap? HID0_NAP: HID0_DOZE) | HID0_DPM;