diff options
| author | Michael Turquette <mturquette@baylibre.com> | 2017-05-25 14:11:11 -0700 |
|---|---|---|
| committer | Michael Turquette <mturquette@baylibre.com> | 2017-05-25 14:11:11 -0700 |
| commit | 658a7568030e287215b069a9c383c0fd0c5f57d5 (patch) | |
| tree | fcdf00761433d480e9df3f90d14256c5b0984080 | |
| parent | 370d9192719e6c174167888cf9240df2542e3b4b (diff) | |
| parent | dbed87a9d3a857a86f602775b5845f5f6d9652b5 (diff) | |
| download | linux-stable-658a7568030e287215b069a9c383c0fd0c5f57d5.tar.gz linux-stable-658a7568030e287215b069a9c383c0fd0c5f57d5.tar.bz2 linux-stable-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
| -rw-r--r-- | drivers/clk/meson/Kconfig | 1 |
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. |