diff options
| author | Stephen Warren <swarren@nvidia.com> | 2013-04-04 16:08:13 -0600 |
|---|---|---|
| committer | Stephen Warren <swarren@nvidia.com> | 2013-04-04 16:08:13 -0600 |
| commit | 43089433b00a086980fc6e9571535477fb749e84 (patch) | |
| tree | 194817879be6f5cc5e56bc2ab2c3276af146238c /arch | |
| parent | 8aa15d82df291b398d604b527a20310f10c1c706 (diff) | |
| parent | 533ddeb1e86f506129ee388a6cc13796dcf31311 (diff) | |
Merge remote-tracking branch 'linaro_mturquette_linux/clk-for-3.10' into for-3.10/clk
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; |