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]
/
include
/
asm-arm
/
arch-ixp4xx
/
system.h
diff --git
a/include/asm-arm/arch-ixp4xx/system.h
b/include/asm-arm/arch-ixp4xx/system.h
index
8a78b96
..
8e1db42
100644
(file)
--- a/
include/asm-arm/arch-ixp4xx/system.h
+++ b/
include/asm-arm/arch-ixp4xx/system.h
@@
-1,5
+1,5
@@
/*
/*
- * include/asm-arm/arch-ixp4x
//system.h
+ * include/asm-arm/arch-ixp4x
x/system.h
*
* Copyright (C) 2002 Intel Corporation.
*
*
* Copyright (C) 2002 Intel Corporation.
*
@@
-31,13
+31,12
@@
static inline void arch_reset(char mode)
/* set the "key" register to enable access to
* "timer" and "enable" registers
*/
/* set the "key" register to enable access to
* "timer" and "enable" registers
*/
- *IXP4XX_OSWK =
0x482e;
+ *IXP4XX_OSWK =
IXP4XX_WDT_KEY;
- /* write 0 to the timer register for an imm
i
diate reset */
+ /* write 0 to the timer register for an imm
e
diate reset */
*IXP4XX_OSWT = 0;
*IXP4XX_OSWT = 0;
- /* disable watchdog interrupt, enable reset, enable count */
- *IXP4XX_OSWE = 0x3;
+ *IXP4XX_OSWE = IXP4XX_WDT_RESET_ENABLE | IXP4XX_WDT_COUNT_ENABLE;
}
}
}
}