Merge branch 'omap4-i2c-init' into omap-for-linus

1 files changed, 4 insertions, 3 deletions

diff --git a/arch/arm/mach-integrator/include/mach/clkdev.h b/arch/arm/mach-integrator/include/mach/clkdev.h
index 9293e410832a..bfe07679faec 100644
--- a/arch/arm/mach-integrator/include/mach/clkdev.h
+++ b/arch/arm/mach-integrator/include/mach/clkdev.h
@@ -2,14 +2,15 @@
 #define __ASM_MACH_CLKDEV_H
 
 #include <linux/module.h>
-#include <asm/hardware/icst525.h>
+#include <plat/clock.h>
 
 struct clk {
         unsigned long           rate;
+        const struct clk_ops    *ops;
         struct module           *owner;
-        const struct icst525_params *params;
+        const struct icst_params *params;
+        void __iomem            *vcoreg;
         void                    *data;
-        void                    (*setvco)(struct clk *, struct icst525_vco vco);
 };
 
 static inline int __clk_get(struct clk *clk)