diff options
| author | Russell King <rmk@dyn-67.arm.linux.org.uk> | 2008-10-09 20:33:03 (GMT) |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2008-10-09 20:33:03 (GMT) |
| commit | b1add0480a95b6ceaece5caf6c50614771eae9b2 (patch) | |
| tree | 06f969f37bd0f51d9ebcccdb3e3ae983edaad889 /arch/arm/plat-mxc/include/mach/clock.h | |
| parent | 3f30a09a612bac2b531a206c2a58a292dd7ff182 (diff) | |
| parent | 58a85f465fb16a918a869eba05addb8f78d9e064 (diff) | |
| download | linux-fsl-qoriq-b1add0480a95b6ceaece5caf6c50614771eae9b2.tar.xz | |
Merge branch 'for-rmk' of git://pasiphae.extern.pengutronix.de/git/imx/linux-2.6.git
Merge branch 'imx-devel' into devel
Diffstat (limited to 'arch/arm/plat-mxc/include/mach/clock.h')
| -rw-r--r-- | arch/arm/plat-mxc/include/mach/clock.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/plat-mxc/include/mach/clock.h b/arch/arm/plat-mxc/include/mach/clock.h index 24caa2b..d21f78e 100644 --- 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 *); |