Commit 658a7568 authored by Michael Turquette's avatar Michael Turquette
Browse files

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
parents 370d9192 dbed87a9

drivers/clk/meson/Kconfig

+1 −0
Original line number Diff line number Diff line
@@ -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.

CRA Git | Maintained and supported by SUSTech CRA and CCSE