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
vserver 1.9.5.x5
[linux-2.6.git]
/
include
/
asm-arm
/
arch-sa1100
/
system.h
diff --git
a/include/asm-arm/arch-sa1100/system.h
b/include/asm-arm/arch-sa1100/system.h
index
c0bbe24
..
6f52118
100644
(file)
--- a/
include/asm-arm/arch-sa1100/system.h
+++ b/
include/asm-arm/arch-sa1100/system.h
@@
-10,13
+10,6
@@
static inline void arch_idle(void)
cpu_do_idle();
}
cpu_do_idle();
}
-#ifdef CONFIG_SA1100_VICTOR
-
-/* power off unconditionally */
-#define arch_reset(x) machine_power_off()
-
-#else
-
static inline void arch_reset(char mode)
{
if (mode == 's') {
static inline void arch_reset(char mode)
{
if (mode == 's') {
@@
-27,5
+20,3
@@
static inline void arch_reset(char mode)
RSRR = RSRR_SWR;
}
}
RSRR = RSRR_SWR;
}
}
-
-#endif