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 kernel-2.6.17-1.2142_FC4 patched with stable patch-2.6.17.4-vs2.0.2-rc26.diff
[linux-2.6.git]
/
arch
/
mips
/
momentum
/
ocelot_c
/
reset.c
diff --git
a/arch/mips/momentum/ocelot_c/reset.c
b/arch/mips/momentum/ocelot_c/reset.c
index
1f2b426
..
9dcd154
100644
(file)
--- a/
arch/mips/momentum/ocelot_c/reset.c
+++ b/
arch/mips/momentum/ocelot_c/reset.c
@@
-28,13
+28,13
@@
void momenco_ocelot_restart(char *command)
{
/* base address of timekeeper portion of part */
void *nvram = (void *)
{
/* base address of timekeeper portion of part */
void *nvram = (void *)
-#ifdef CONFIG_
MIPS64
+#ifdef CONFIG_
64BIT
0xfffffffffc807000;
#else
0xfc807000;
#endif
0xfffffffffc807000;
#else
0xfc807000;
#endif
- /* 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 */