diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2011-11-24 15:56:03 +0000 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2011-11-24 15:56:03 +0000 |
| commit | b70c4207821f3f895e1c4c368aa0bece9141e524 (patch) | |
| tree | d5644c819d3773691a1be3f33a6cf6bc34a25b0c /arch/arm/mach-omap1/clock.h | |
| parent | 597b97cab66da331ae9e19e728601e62542a7ca8 (diff) | |
| parent | 52f3a41e0aca5625fbd118ed57a4debb25817e99 (diff) | |
Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap into fixes
Diffstat (limited to 'arch/arm/mach-omap1/clock.h')
| -rw-r--r-- | arch/arm/mach-omap1/clock.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/arch/arm/mach-omap1/clock.h b/arch/arm/mach-omap1/clock.h index eaf09efb91ca..16b1423b454a 100644 --- a/arch/arm/mach-omap1/clock.h +++ b/arch/arm/mach-omap1/clock.h @@ -17,7 +17,8 @@ #include <plat/clock.h> -extern int __init omap1_clk_init(void); +int omap1_clk_init(void); +void omap1_clk_late_init(void); extern int omap1_clk_enable(struct clk *clk); extern void omap1_clk_disable(struct clk *clk); extern long omap1_clk_round_rate(struct clk *clk, unsigned long rate); |