Merge branch 'for-rmk' of git://pasiphae.extern.pengutronix.de/git/imx/linux-2.6.git

[linux-2.6-omap-h63xx.git] / arch / arm / plat-mxc / include / mach / clock.h

diff --git a/arch/arm/plat-mxc/include/mach/clock.h b/arch/arm/plat-mxc/include/mach/clock.h
index 24caa2b7c91d9f1b219fb431065013da15a22f65..d21f78e7881945e094be4953d461cd5986688ee9 100644 (file)
--- a/arch/arm/plat-mxc/include/mach/clock.h
+++ b/arch/arm/plat-mxc/include/mach/clock.h
@@ -39,7 +39,7 @@ struct clk {
        /* Register bit position for clock's enable/disable control. */
        u8 enable_shift;
        /* Register address for clock's enable/disable control. */
-       u32 enable_reg;
+       void __iomem *enable_reg;
        u32 flags;
        /* get the current clock rate (always a fresh value) */
        unsigned long (*get_rate) (struct clk *);