diff options
| author | Ingo Molnar <mingo@kernel.org> | 2017-06-22 10:57:28 +0200 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2017-06-22 10:57:28 +0200 |
| commit | a4eb8b993554d374002663200bf5721f7f2ee259 (patch) | |
| tree | e8934fdf72b4b09db9f514ae82bc81d03959b942 /drivers/clk/sunxi-ng/ccu-sun5i.c | |
| parent | 26179670a68b7b365fbfe38afb043dcd2e1a4678 (diff) | |
| parent | 8d829b9bb878904f3419af8003176a12910b94e8 (diff) | |
| download | linux-a4eb8b993554d374002663200bf5721f7f2ee259.tar.gz linux-a4eb8b993554d374002663200bf5721f7f2ee259.tar.bz2 linux-a4eb8b993554d374002663200bf5721f7f2ee259.zip | |
Merge branch 'linus' into x86/mm, to pick up fixes
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'drivers/clk/sunxi-ng/ccu-sun5i.c')
| -rw-r--r-- | drivers/clk/sunxi-ng/ccu-sun5i.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/clk/sunxi-ng/ccu-sun5i.c b/drivers/clk/sunxi-ng/ccu-sun5i.c index 5c476f966a72..5372bf8be5e6 100644 --- a/drivers/clk/sunxi-ng/ccu-sun5i.c +++ b/drivers/clk/sunxi-ng/ccu-sun5i.c @@ -243,7 +243,7 @@ static SUNXI_CCU_GATE(ahb_ss_clk, "ahb-ss", "ahb", static SUNXI_CCU_GATE(ahb_dma_clk, "ahb-dma", "ahb", 0x060, BIT(6), 0); static SUNXI_CCU_GATE(ahb_bist_clk, "ahb-bist", "ahb", - 0x060, BIT(6), 0); + 0x060, BIT(7), 0); static SUNXI_CCU_GATE(ahb_mmc0_clk, "ahb-mmc0", "ahb", 0x060, BIT(8), 0); static SUNXI_CCU_GATE(ahb_mmc1_clk, "ahb-mmc1", "ahb", |