Эх сурвалжийг харах

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
Michael Turquette 8 жил өмнө
parent
commit
658a756803

+ 1 - 0
drivers/clk/meson/Kconfig

@@ -14,6 +14,7 @@ config COMMON_CLK_MESON8B
 config COMMON_CLK_GXBB
 config COMMON_CLK_GXBB
 	bool
 	bool
 	depends on COMMON_CLK_AMLOGIC
 	depends on COMMON_CLK_AMLOGIC
+	select RESET_CONTROLLER
 	help
 	help
 	  Support for the clock controller on AmLogic S905 devices, aka gxbb.
 	  Support for the clock controller on AmLogic S905 devices, aka gxbb.
 	  Say Y if you want peripherals and CPU frequency scaling to work.
 	  Say Y if you want peripherals and CPU frequency scaling to work.