aboutsummaryrefslogtreecommitdiffstats
path: root/drivers
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2017-04-28 20:04:31 -0400
committerLinus Torvalds <torvalds@linux-foundation.org>2017-04-28 20:04:31 -0400
commit0060e79a1f5231940ef38e6621745c0c808065cb (patch)
treeff866bf345752cf17ba2b01a5081cc25d754642b /drivers
parent0e9117882da14e7914d05cf14781a7ac9c61c670 (diff)
parent36c02d0be4c3c8804e51f9740f0d768e17f3b566 (diff)
Merge tag 'clk-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/clk/linux
Pull clk fix from Stephen Boyd: "One odd config build fix for a recent Allwinner clock driver change that got merged. The common code called code in another file that wasn't always built. This just forces it on so people don't run into this bad configuration" * tag 'clk-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/clk/linux: clk: sunxi-ng: always select CCU_GATE
Diffstat (limited to 'drivers')
-rw-r--r--drivers/clk/sunxi-ng/Kconfig2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/clk/sunxi-ng/Kconfig b/drivers/clk/sunxi-ng/Kconfig
index 1c2357301017..a077ab6edffa 100644
--- a/drivers/clk/sunxi-ng/Kconfig
+++ b/drivers/clk/sunxi-ng/Kconfig
@@ -16,7 +16,7 @@ config SUNXI_CCU_FRAC
16 bool 16 bool
17 17
18config SUNXI_CCU_GATE 18config SUNXI_CCU_GATE
19 bool 19 def_bool y
20 20
21config SUNXI_CCU_MUX 21config SUNXI_CCU_MUX
22 bool 22 bool