Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/percpu

[pandora-kernel.git] / arch / sh / include / asm / clock.h

diff --git a/arch/sh/include/asm/clock.h b/arch/sh/include/asm/clock.h
index 501d0b0..11da4c5 100644 (file)
--- a/arch/sh/include/asm/clock.h
+++ b/arch/sh/include/asm/clock.h
@@ -146,12 +146,17 @@ int sh_clk_mstp32_register(struct clk *clks, int nr);
        .flags = _flags,                                                \
 }
 
+struct clk_div4_table {
+       struct clk_div_mult_table *div_mult_table;
+       void (*kick)(struct clk *clk);
+};
+
 int sh_clk_div4_register(struct clk *clks, int nr,
-                        struct clk_div_mult_table *table);
+                        struct clk_div4_table *table);
 int sh_clk_div4_enable_register(struct clk *clks, int nr,
-                        struct clk_div_mult_table *table);
+                        struct clk_div4_table *table);
 int sh_clk_div4_reparent_register(struct clk *clks, int nr,
-                        struct clk_div_mult_table *table);
+                        struct clk_div4_table *table);
 
 #define SH_CLK_DIV6(_name, _parent, _reg, _flags)      \
 {                                                      \