diff options
author | David S. Miller <davem@davemloft.net> | 2009-03-29 10:40:34 +0200 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2009-03-29 10:40:34 +0200 |
commit | 13223cb02ccfa375f2d683d08d30db5b72264f1e (patch) | |
tree | d3fc7d803d22bbfe03b96cf0ba38041d42c8a1c2 /arch/arm/mach-s3c2410/include/mach/system-reset.h | |
parent | tg3: Add GRO support. (diff) | |
parent | Merge branch 'i2c-for-linus' of git://jdelvare.pck.nerim.net/jdelvare-2.6 (diff) | |
download | linux-13223cb02ccfa375f2d683d08d30db5b72264f1e.tar.xz linux-13223cb02ccfa375f2d683d08d30db5b72264f1e.zip |
Merge branch 'master' of /home/davem/src/GIT/linux-2.6/
Diffstat (limited to 'arch/arm/mach-s3c2410/include/mach/system-reset.h')
-rw-r--r-- | arch/arm/mach-s3c2410/include/mach/system-reset.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/mach-s3c2410/include/mach/system-reset.h b/arch/arm/mach-s3c2410/include/mach/system-reset.h index 7613d0a384ba..b8687f71c304 100644 --- 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; |