git.samba.org
/
sfrench
/
cifs-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'devel' of git://git.kernel.org/pub/scm/linux/kernel/git/ycmiao/pxa...
[sfrench/cifs-2.6.git]
/
arch
/
arm
/
mach-ebsa110
/
include
/
mach
/
system.h
diff --git
a/arch/arm/mach-ebsa110/include/mach/system.h
b/arch/arm/mach-ebsa110/include/mach/system.h
index 350a028997efddc34c8a87606928a0ebc25eef85..9a26245bf1fc58900c39242b90a6e1cabb3eeb14 100644
(file)
--- a/
arch/arm/mach-ebsa110/include/mach/system.h
+++ b/
arch/arm/mach-ebsa110/include/mach/system.h
@@
-34,6
+34,6
@@
static inline void arch_idle(void)
asm volatile ("mcr p15, 0, ip, c15, c1, 2" : : : "cc");
}
-#define arch_reset(mode
)
cpu_reset(0x80000000)
+#define arch_reset(mode
, cmd)
cpu_reset(0x80000000)
#endif