Merge remote-tracking branch 'clk/clk-next'

[deliverable/linux.git] / drivers / clk / berlin / berlin2-pll.h

diff --git a/drivers/clk/berlin/berlin2-pll.h b/drivers/clk/berlin/berlin2-pll.h
index 8831ce27ac1e9bd39eb870eb0b32872a64d47599..583e024b9bed279136b9add760475b0098925c4f 100644 (file)
--- a/drivers/clk/berlin/berlin2-pll.h
+++ b/drivers/clk/berlin/berlin2-pll.h
@@ -19,8 +19,6 @@
 #ifndef __BERLIN2_PLL_H
 #define __BERLIN2_PLL_H
 
-struct clk;
-
 struct berlin2_pll_map {
        const u8 vcodiv[16];
        u8 mult;
@@ -29,9 +27,8 @@ struct berlin2_pll_map {
        u8 divsel_shift;
 };
 
-struct clk * __init
-berlin2_pll_register(const struct berlin2_pll_map *map,
-                    void __iomem *base, const char *name,
-                    const char *parent_name, unsigned long flags);
+int berlin2_pll_register(const struct berlin2_pll_map *map,
+                        void __iomem *base, const char *name,
+                        const char *parent_name, unsigned long flags);
 
 #endif /* __BERLIN2_PLL_H */