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 locking-for-linus
[sfrench/cifs-2.6.git]
/
arch
/
arm
/
mach-ks8695
/
include
/
mach
/
system.h
diff --git
a/arch/arm/mach-ks8695/include/mach/system.h
b/arch/arm/mach-ks8695/include/mach/system.h
index 5a9b032bdbeb5a95318291faa426f9f12aeb42ed..fb1dda9be2d0a8c7fd6a032fb06417af1499455d 100644
(file)
--- a/
arch/arm/mach-ks8695/include/mach/system.h
+++ b/
arch/arm/mach-ks8695/include/mach/system.h
@@
-27,7
+27,7
@@
static void arch_idle(void)
}
-static void arch_reset(char mode)
+static void arch_reset(char mode
, const char *cmd
)
{
unsigned int reg;