projects
/
cascardo
/
linux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'for-linus' of git://git.samba.org/sfrench/cifs-2.6
[cascardo/linux.git]
/
arch
/
arm
/
mach-orion5x
/
common.c
diff --git
a/arch/arm/mach-orion5x/common.c
b/arch/arm/mach-orion5x/common.c
index
f8a6db9
..
b41599f
100644
(file)
--- a/
arch/arm/mach-orion5x/common.c
+++ b/
arch/arm/mach-orion5x/common.c
@@
-347,7
+347,7
@@
void __init orion5x_init(void)
orion5x_wdt_init();
}
-void orion5x_restart(
char
mode, const char *cmd)
+void orion5x_restart(
enum reboot_mode
mode, const char *cmd)
{
/*
* Enable and issue soft reset