| commit | ea0763a7e62f60f3e166327268a80f16ad806718 | [log] [tgz] |
|---|---|---|
| author | Paul Mackerras <paulus@samba.org> | Fri Aug 25 14:56:07 2006 +1000 |
| committer | Paul Mackerras <paulus@samba.org> | Fri Aug 25 14:56:07 2006 +1000 |
| tree | de54ec5e5d5a49b3cba81b096b7572852aa6f5a9 | |
| parent | 271c511db9d37d6797745adb1f151a8bd2838c6f [diff] [blame] | |
| parent | c85c41ad73c6db4cf4cc98c595cc5e2fdbdb53d5 [diff] [blame] |
Merge branch 'merge'
diff --git a/arch/powerpc/kernel/cpu_setup_ppc970.S b/arch/powerpc/kernel/cpu_setup_ppc970.S index f619932..6525948 100644 --- a/arch/powerpc/kernel/cpu_setup_ppc970.S +++ b/arch/powerpc/kernel/cpu_setup_ppc970.S
@@ -81,6 +81,8 @@ mfspr r0,SPRN_HID0 li r11,5 /* clear DOZE and SLEEP */ rldimi r0,r11,52,8 /* set NAP and DPM */ + li r11,0 + rldimi r0,r11,32,31 /* clear EN_ATTN */ mtspr SPRN_HID0,r0 mfspr r0,SPRN_HID0 mfspr r0,SPRN_HID0