diff options
| author | Jeff Garzik <jeff@garzik.org> | 2006-03-24 09:24:04 -0500 |
|---|---|---|
| committer | Jeff Garzik <jeff@garzik.org> | 2006-03-24 09:24:04 -0500 |
| commit | 11ed56fb7899f9eb9eaef8e5919db1bf08f1b07e (patch) | |
| tree | b01421cb139b11065d776ed361a7a12b3a1aecc9 /arch/mips/momentum/ocelot_3/reset.c | |
| parent | 54da9a3968448681d0ddf193ec90f2480c5cba1c (diff) | |
| parent | 2cc432eed0491df66e14b578139bba2c75fb3f9a (diff) | |
Merge branch 'upstream'
Conflicts:
drivers/scsi/sata_vsc.c
Diffstat (limited to 'arch/mips/momentum/ocelot_3/reset.c')
| -rw-r--r-- | arch/mips/momentum/ocelot_3/reset.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/mips/momentum/ocelot_3/reset.c b/arch/mips/momentum/ocelot_3/reset.c index 72b4423c0864..9d86d2468376 100644 --- a/arch/mips/momentum/ocelot_3/reset.c +++ b/arch/mips/momentum/ocelot_3/reset.c | |||
| @@ -34,7 +34,7 @@ void momenco_ocelot_restart(char *command) | |||
| 34 | /* base address of timekeeper portion of part */ | 34 | /* base address of timekeeper portion of part */ |
| 35 | void *nvram = (void *) 0xfc807000L; | 35 | void *nvram = (void *) 0xfc807000L; |
| 36 | 36 | ||
| 37 | /* Ask the NVRAM/RTC/watchdog chip to assert reset in 1/16 second */ | 37 | /* Ask the NVRAM/RTC/watchdog chip to assert reset in 1/16 second */ |
| 38 | writeb(0x84, nvram + 0xff7); | 38 | writeb(0x84, nvram + 0xff7); |
| 39 | 39 | ||
| 40 | /* wait for the watchdog to go off */ | 40 | /* wait for the watchdog to go off */ |