git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'for-2.6.30' into for-2.6.31
[pandora-kernel.git]
/
arch
/
arm
/
mach-davinci
/
include
/
mach
/
system.h
diff --git
a/arch/arm/mach-davinci/include/mach/system.h
b/arch/arm/mach-davinci/include/mach/system.h
index
17ca41d
..
b7e7036
100644
(file)
--- a/
arch/arm/mach-davinci/include/mach/system.h
+++ b/
arch/arm/mach-davinci/include/mach/system.h
@@
-21,7
+21,7
@@
static void arch_idle(void)
cpu_do_idle();
}
-static void arch_reset(char mode)
+static void arch_reset(char mode
, const char *cmd
)
{
davinci_watchdog_reset();
}