Merge branch 'origin' into devel

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

diff --git a/arch/arm/mach-s3c2410/include/mach/system-reset.h b/arch/arm/mach-s3c2410/include/mach/system-reset.h
index 7613d0a384ba23d47cd054562e8aa50b66dfff9d..b8687f71c30479c90400e2a36a4c51086c591007 100644 (file)
--- a/arch/arm/mach-s3c2410/include/mach/system-reset.h
+++ b/arch/arm/mach-s3c2410/include/mach/system-reset.h
@@ -22,7 +22,7 @@
 extern void (*s3c24xx_reset_hook)(void);
 
 static void
-arch_reset(char mode)
+arch_reset(char mode, const char *cmd)
 {
        struct clk *wdtclk;