aboutsummaryrefslogtreecommitdiff
path: root/arch/arm/mach-mmp
diff options
context:
space:
mode:
authorRussell King <rmk@dyn-67.arm.linux.org.uk>2009-03-29 17:14:45 +0100
committerRussell King <rmk+kernel@arm.linux.org.uk>2009-03-30 10:40:12 +0100
commit8f6aef924d6d83f67e74ca5edc98957867c50ce9 (patch)
tree0a50299920f6db7f8ada23108e927e7cdac10da4 /arch/arm/mach-mmp
parent0d34fb8e93ceba7b6dad0062dbb4a0813bacd75b (diff)
downloadlinux-2.6.34-ux500-8f6aef924d6d83f67e74ca5edc98957867c50ce9.tar.gz
[ARM] arch_reset() now takes a second parameter
Add it to the new platforms. Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
Diffstat (limited to 'arch/arm/mach-mmp')
-rw-r--r--arch/arm/mach-mmp/include/mach/system.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/mach-mmp/include/mach/system.h b/arch/arm/mach-mmp/include/mach/system.h
index 001edfefec1..4f5b0e0ce6c 100644
--- a/arch/arm/mach-mmp/include/mach/system.h
+++ b/arch/arm/mach-mmp/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)
{
cpu_reset(0);
}