git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'master' of git://git.infradead.org/users/linville/wireless into for...
[pandora-kernel.git]
/
arch
/
arm
/
plat-samsung
/
include
/
plat
/
clock.h
diff --git
a/arch/arm/plat-samsung/include/plat/clock.h
b/arch/arm/plat-samsung/include/plat/clock.h
index
87d5b38
..
73c66d4
100644
(file)
--- 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.
*/
* 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>
#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);
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 */