diff options
author | Arnd Bergmann <arnd@arndb.de> | 2011-10-07 23:07:41 +0200 |
---|---|---|
committer | Arnd Bergmann <arnd@arndb.de> | 2011-10-07 23:07:41 +0200 |
commit | 8efc59ad6764ade520012cb192cd484e5191cd9c (patch) | |
tree | d2465d91ebb2652e35cd08f715fc202b3f9e042a /arch/arm/plat-samsung/include/plat/clock.h | |
parent | 6f6184a9d01880a3e21349544f73b3720ce5e152 (diff) | |
parent | 492c4a0df11573e141a2decc6012b3bddd14a11e (diff) | |
download | linux-8efc59ad6764ade520012cb192cd484e5191cd9c.tar.gz linux-8efc59ad6764ade520012cb192cd484e5191cd9c.tar.bz2 linux-8efc59ad6764ade520012cb192cd484e5191cd9c.zip |
Merge branch 'sirf/cleanup' into next/cleanup
Diffstat (limited to 'arch/arm/plat-samsung/include/plat/clock.h')
-rw-r--r-- | arch/arm/plat-samsung/include/plat/clock.h | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/arch/arm/plat-samsung/include/plat/clock.h b/arch/arm/plat-samsung/include/plat/clock.h index 87d5b38a86fb..73c66d4d10fa 100644 --- a/arch/arm/plat-samsung/include/plat/clock.h +++ b/arch/arm/plat-samsung/include/plat/clock.h @@ -9,6 +9,9 @@ * published by the Free Software Foundation. */ +#ifndef __ASM_PLAT_CLOCK_H +#define __ASM_PLAT_CLOCK_H __FILE__ + #include <linux/spinlock.h> #include <linux/clkdev.h> @@ -121,3 +124,8 @@ extern int s3c64xx_sclk_ctrl(struct clk *clk, int enable); extern void s3c_pwmclk_init(void); +/* Global watchdog clock used by arch_wtd_reset() callback */ + +extern struct clk *s3c2410_wdtclk; + +#endif /* __ASM_PLAT_CLOCK_H */ |