diff options
author | Takashi Iwai <tiwai@suse.de> | 2014-12-08 11:33:24 +0100 |
---|---|---|
committer | Takashi Iwai <tiwai@suse.de> | 2014-12-08 11:33:24 +0100 |
commit | 77de61c3975da6f2200935c341e84018ece6ce36 (patch) | |
tree | 36508cf93ef62a80c988fa18c86eda1274e03877 /drivers/clk/qcom/mmcc-apq8084.c | |
parent | ALSA: usb-audio: Don't resubmit pending URBs at MIDI error recovery (diff) | |
parent | ALSA: atmel_abdac: Add missing clock prepare (diff) | |
download | linux-dev-77de61c3975da6f2200935c341e84018ece6ce36.tar.xz linux-dev-77de61c3975da6f2200935c341e84018ece6ce36.zip |
Merge branch 'for-next' into for-linus
Diffstat (limited to 'drivers/clk/qcom/mmcc-apq8084.c')
-rw-r--r-- | drivers/clk/qcom/mmcc-apq8084.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/clk/qcom/mmcc-apq8084.c b/drivers/clk/qcom/mmcc-apq8084.c index dab988ab8cf1..157139a5c1ca 100644 --- a/drivers/clk/qcom/mmcc-apq8084.c +++ b/drivers/clk/qcom/mmcc-apq8084.c @@ -3122,7 +3122,7 @@ static struct clk_regmap *mmcc_apq8084_clocks[] = { [ESC1_CLK_SRC] = &esc1_clk_src.clkr, [HDMI_CLK_SRC] = &hdmi_clk_src.clkr, [VSYNC_CLK_SRC] = &vsync_clk_src.clkr, - [RBCPR_CLK_SRC] = &rbcpr_clk_src.clkr, + [MMSS_RBCPR_CLK_SRC] = &rbcpr_clk_src.clkr, [RBBMTIMER_CLK_SRC] = &rbbmtimer_clk_src.clkr, [MAPLE_CLK_SRC] = &maple_clk_src.clkr, [VDP_CLK_SRC] = &vdp_clk_src.clkr, |