diff options
| author | Jeff Garzik <jeff@garzik.org> | 2006-06-11 23:04:37 -0400 |
|---|---|---|
| committer | Jeff Garzik <jeff@garzik.org> | 2006-06-11 23:04:37 -0400 |
| commit | fec69a97489f961026e24536dbb7b86ac663948c (patch) | |
| tree | 869713470d81ebc261598489a2711960336c7c37 /arch/mips/au1000/common/sleeper.S | |
| parent | 1049cb478783c74ca8c99ef70e7d2bf920b9335b (diff) | |
| parent | 2f9719b61e1fcf7422a016ac4f2420a0cc6ba320 (diff) | |
Merge branch 'upstream-fixes' into upstream
Conflicts:
drivers/scsi/sata_sil24.c
Diffstat (limited to 'arch/mips/au1000/common/sleeper.S')
| -rw-r--r-- | arch/mips/au1000/common/sleeper.S | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/arch/mips/au1000/common/sleeper.S b/arch/mips/au1000/common/sleeper.S index 44dac3b0df3b..683d9da84b66 100644 --- a/arch/mips/au1000/common/sleeper.S +++ b/arch/mips/au1000/common/sleeper.S | |||
| @@ -112,6 +112,11 @@ sdsleep: | |||
| 112 | mtc0 k0, CP0_PAGEMASK | 112 | mtc0 k0, CP0_PAGEMASK |
| 113 | lw k0, 0x14(sp) | 113 | lw k0, 0x14(sp) |
| 114 | mtc0 k0, CP0_CONFIG | 114 | mtc0 k0, CP0_CONFIG |
| 115 | |||
| 116 | /* We need to catch the ealry Alchemy SOCs with | ||
| 117 | * the write-only Config[OD] bit and set it back to one... | ||
| 118 | */ | ||
| 119 | jal au1x00_fixup_config_od | ||
| 115 | lw $1, PT_R1(sp) | 120 | lw $1, PT_R1(sp) |
| 116 | lw $2, PT_R2(sp) | 121 | lw $2, PT_R2(sp) |
| 117 | lw $3, PT_R3(sp) | 122 | lw $3, PT_R3(sp) |