git://git.onelab.eu
/
linux-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
fedora core 6 1.2949 + vserver 2.2.0
[linux-2.6.git]
/
arch
/
mips
/
momentum
/
ocelot_3
/
reset.c
diff --git
a/arch/mips/momentum/ocelot_3/reset.c
b/arch/mips/momentum/ocelot_3/reset.c
index
cb7e356
..
9d86d24
100644
(file)
--- a/
arch/mips/momentum/ocelot_3/reset.c
+++ b/
arch/mips/momentum/ocelot_3/reset.c
@@
-4,7
+4,7
@@
* Free Software Foundation; either version 2 of the License, or (at your
* option) any later version.
*
* Free Software Foundation; either version 2 of the License, or (at your
* option) any later version.
*
- * Copyright (C) 1997,
2001
Ralf Baechle
+ * Copyright (C) 1997,
01, 05
Ralf Baechle
* Copyright 2001 MontaVista Software Inc.
* Author: jsun@mvista.com or jsun@junsun.net
*
* Copyright 2001 MontaVista Software Inc.
* Author: jsun@mvista.com or jsun@junsun.net
*
@@
-20,7
+20,6
@@
* Copyright (C) 2004 MontaVista Software Inc.
* Author: Manish Lachwani, mlachwani@mvista.com
*/
* Copyright (C) 2004 MontaVista Software Inc.
* Author: Manish Lachwani, mlachwani@mvista.com
*/
-#include <linux/config.h>
#include <linux/sched.h>
#include <linux/mm.h>
#include <linux/delay.h>
#include <linux/sched.h>
#include <linux/mm.h>
#include <linux/delay.h>
@@
-35,7
+34,7
@@
void momenco_ocelot_restart(char *command)
/* base address of timekeeper portion of part */
void *nvram = (void *) 0xfc807000L;
/* base address of timekeeper portion of part */
void *nvram = (void *) 0xfc807000L;
- /* Ask the NVRAM/RTC/watchdog chip to assert reset in 1/16 second */
+ /* Ask the NVRAM/RTC/watchdog chip to assert reset in 1/16 second */
writeb(0x84, nvram + 0xff7);
/* wait for the watchdog to go off */
writeb(0x84, nvram + 0xff7);
/* wait for the watchdog to go off */