Merge branch 'for-rmk' of git://gitorious.org/linux-gemini/mainline into devel

[linux-2.6-omap-h63xx.git] / arch / arm / mach-realview / include / mach / system.h

diff --git a/arch/arm/mach-realview/include/mach/system.h b/arch/arm/mach-realview/include/mach/system.h
index a2f61c78adbf26cadb3ce184c4eb927edba53b32..1a15a441e027550e9503a662592c8015544992c7 100644 (file)
--- a/arch/arm/mach-realview/include/mach/system.h
+++ b/arch/arm/mach-realview/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)
 {
        void __iomem *hdr_ctrl = __io_address(REALVIEW_SYS_BASE) + REALVIEW_SYS_RESETCTL_OFFSET;
        unsigned int val;