diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2013-04-09 17:09:35 +0200 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2013-04-09 17:09:35 +0200 |
| commit | 5790c58b133913f92fd737c03efce9db7a1d2d4d (patch) | |
| tree | deef8f070b4de7fcff62d496d09842ff91ed83d0 /arch | |
| parent | 1194b152cd4eff475652785ce366b20afe82dfcf (diff) | |
| parent | 533ddeb1e86f506129ee388a6cc13796dcf31311 (diff) | |
Merge branch 'depends/clk' into next/drivers
This is a snapshot of the stable clk branch at
git://git.linaro.org/people/mturquette/linux.git clk-for-3.10
which is a dependency for the tegra clock changes.
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/arm/mach-imx/clk-busy.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/mach-imx/clk-busy.c b/arch/arm/mach-imx/clk-busy.c index 1ab91b5209e..85b728cc27a 100644 --- a/arch/arm/mach-imx/clk-busy.c +++ b/arch/arm/mach-imx/clk-busy.c @@ -169,7 +169,7 @@ struct clk *imx_clk_busy_mux(const char *name, void __iomem *reg, u8 shift, busy->mux.reg = reg; busy->mux.shift = shift; - busy->mux.width = width; + busy->mux.mask = BIT(width) - 1; busy->mux.lock = &imx_ccm_lock; busy->mux_ops = &clk_mux_ops; |