diff options
| author | Russell King <rmk+kernel@arm.linux.org.uk> | 2010-09-01 10:08:50 +0100 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2010-09-01 10:08:50 +0100 |
| commit | b6d17c1a8e64e8b7f58dde3d353de664a492908a (patch) | |
| tree | 160c175e9c3ab65a7221effadee78eba24e7d2f4 /arch/arm/mach-mx5 | |
| parent | 1fd317076caf1ee22ddb6a7853a0ca462f0233c5 (diff) | |
| parent | 14f0f512ba6f4eccc9b7cf67be47439ed2917afb (diff) | |
| download | op-kernel-dev-b6d17c1a8e64e8b7f58dde3d353de664a492908a.zip op-kernel-dev-b6d17c1a8e64e8b7f58dde3d353de664a492908a.tar.gz | |
Merge branch 'imx-for-2.6.36' of git://git.pengutronix.de/git/imx/linux-2.6
Diffstat (limited to 'arch/arm/mach-mx5')
| -rw-r--r-- | arch/arm/mach-mx5/clock-mx51.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/mach-mx5/clock-mx51.c b/arch/arm/mach-mx5/clock-mx51.c index 6af69de..57c10a9 100644 --- a/arch/arm/mach-mx5/clock-mx51.c +++ b/arch/arm/mach-mx5/clock-mx51.c @@ -56,7 +56,7 @@ static void _clk_ccgr_disable(struct clk *clk) { u32 reg; reg = __raw_readl(clk->enable_reg); - reg &= ~(MXC_CCM_CCGRx_MOD_OFF << clk->enable_shift); + reg &= ~(MXC_CCM_CCGRx_CG_MASK << clk->enable_shift); __raw_writel(reg, clk->enable_reg); } |
