diff options
| author | Paul Mackerras <paulus@samba.org> | 2006-08-25 14:56:07 +1000 |
|---|---|---|
| committer | Paul Mackerras <paulus@samba.org> | 2006-08-25 14:56:07 +1000 |
| commit | ea0763a7e62f60f3e166327268a80f16ad806718 (patch) | |
| tree | de54ec5e5d5a49b3cba81b096b7572852aa6f5a9 /arch/powerpc/kernel/cpu_setup_ppc970.S | |
| parent | 271c511db9d37d6797745adb1f151a8bd2838c6f (diff) | |
| parent | c85c41ad73c6db4cf4cc98c595cc5e2fdbdb53d5 (diff) | |
Merge branch 'merge'
Diffstat (limited to 'arch/powerpc/kernel/cpu_setup_ppc970.S')
| -rw-r--r-- | arch/powerpc/kernel/cpu_setup_ppc970.S | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/arch/powerpc/kernel/cpu_setup_ppc970.S b/arch/powerpc/kernel/cpu_setup_ppc970.S index f619932794e8..652594891d58 100644 --- a/arch/powerpc/kernel/cpu_setup_ppc970.S +++ b/arch/powerpc/kernel/cpu_setup_ppc970.S @@ -81,6 +81,8 @@ _GLOBAL(__setup_cpu_ppc970) 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 |