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
mariux64 · May 25, 2017 · 658a756 · 658a756
2 parents 370d919 + dbed87a
commit 658a756
Showing 1 changed file with 1 addition and 0 deletions.
diff --git 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.