summaryrefslogtreecommitdiffstats
path: root/drivers/clk
diff options
context:
space:
mode:
authorMichael Turquette <mturquette@baylibre.com>2017-05-25 23:11:11 +0200
committerMichael Turquette <mturquette@baylibre.com>2017-05-25 23:11:11 +0200
commit658a7568030e287215b069a9c383c0fd0c5f57d5 (patch)
treefcdf00761433d480e9df3f90d14256c5b0984080 /drivers/clk
parentclk: sunxi-ng: sun5i: Fix ahb_bist_clk definition (diff)
parentclk: meson: gxbb: fix build error without RESET_CONTROLLER (diff)
downloadlinux-658a7568030e287215b069a9c383c0fd0c5f57d5.tar.xz
linux-658a7568030e287215b069a9c383c0fd0c5f57d5.zip
Merge tag 'meson-clk-fixes-for-4.12-rc2' of git://github.com/baylibre/clk-meson into clk-fixes
KConfig fix: - clk: meson: gxbb: fix build error without RESET_CONTROLLER
Diffstat (limited to 'drivers/clk')
-rw-r--r--drivers/clk/meson/Kconfig1
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/clk/meson/Kconfig b/drivers/clk/meson/Kconfig
index 19480bcc7046..2f29ee1a4d00 100644
--- a/drivers/clk/meson/Kconfig
+++ b/drivers/clk/meson/Kconfig
@@ -14,6 +14,7 @@ config COMMON_CLK_MESON8B
config COMMON_CLK_GXBB
bool
depends on COMMON_CLK_AMLOGIC
+ select RESET_CONTROLLER
help
Support for the clock controller on AmLogic S905 devices, aka gxbb.
Say Y if you want peripherals and CPU frequency scaling to work.