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 commit 'origin/master' into next
[sfrench/cifs-2.6.git]
/
arch
/
arm
/
mach-iop33x
/
include
/
mach
/
system.h
diff --git
a/arch/arm/mach-iop33x/include/mach/system.h
b/arch/arm/mach-iop33x/include/mach/system.h
index 0cb3ad862acd92ff1d023fbbe169ff46cdc59854..f192a34be0731969dec3547d846db75cd8920fad 100644
(file)
--- a/
arch/arm/mach-iop33x/include/mach/system.h
+++ b/
arch/arm/mach-iop33x/include/mach/system.h
@@
-14,7
+14,7
@@
static inline void arch_idle(void)
cpu_do_idle();
}
-static inline void arch_reset(char mode)
+static inline void arch_reset(char mode
, const char *cmd
)
{
*IOP3XX_PCSR = 0x30;