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-ixp2000
/
system.h
diff --git
a/include/asm-arm/arch-ixp2000/system.h
b/include/asm-arm/arch-ixp2000/system.h
index
ddbbb34
..
3cc9a04
100644
(file)
--- a/
include/asm-arm/arch-ixp2000/system.h
+++ b/
include/asm-arm/arch-ixp2000/system.h
@@
-37,7
+37,7
@@
static inline void arch_reset(char mode)
* to cause a complete reset of the CPU and all external devices
* and move the flash bank register back to 0.
*/
* to cause a complete reset of the CPU and all external devices
* and move the flash bank register back to 0.
*/
- if (machine_is_ixdp2801()) {
+ if (machine_is_ixdp2801()
|| machine_is_ixdp28x5()
) {
unsigned long reset_reg = *IXDP2X01_CPLD_RESET_REG;
reset_reg = 0x55AA0000 | (reset_reg & 0x0000FFFF);
unsigned long reset_reg = *IXDP2X01_CPLD_RESET_REG;
reset_reg = 0x55AA0000 | (reset_reg & 0x0000FFFF);