Merge branch 'for-2.6.30' into for-2.6.31

[sfrench/cifs-2.6.git] / arch / arm / mach-versatile / include / mach / system.h

diff --git a/arch/arm/mach-versatile/include/mach/system.h b/arch/arm/mach-versatile/include/mach/system.h
index c59e6100c7e377744ede2095f67220a27ba84e90..8ffc12a7cb25dd0f0273d8bc6d938d067821f646 100644 (file)
--- a/arch/arm/mach-versatile/include/mach/system.h
+++ b/arch/arm/mach-versatile/include/mach/system.h
@@ -34,7 +34,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)
 {
        u32 val;