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 'linus' into x86/urgent
[sfrench/cifs-2.6.git]
/
arch
/
arm
/
mach-imx
/
include
/
mach
/
system.h
diff --git
a/arch/arm/mach-imx/include/mach/system.h
b/arch/arm/mach-imx/include/mach/system.h
index adee7e51bab2b8bbdce427150465ea30f26591fc..46d4ca91af796e11519a021aa934baa8b162a15a 100644
(file)
--- a/
arch/arm/mach-imx/include/mach/system.h
+++ b/
arch/arm/mach-imx/include/mach/system.h
@@
-32,7
+32,7
@@
arch_idle(void)
}
static inline void
-arch_reset(char mode)
+arch_reset(char mode
, const char *cmd
)
{
cpu_reset(0);
}