diff options
| author |   Stephen Boyd <sboyd@codeaurora.org> | 2016-11-23 14:31:45 -0800 |
|---|---|---|
| committer | Stephen Boyd <sboyd@codeaurora.org> | 2016-11-23 14:31:45 -0800 |
| commit | 5e2035b90e7192b48f9615ddfbcc6fef1149ed8a (patch) | |
| tree | e897246ef058c21b92b6e93a53877b326f033686 /drivers/clk/bcm | |
| parent | clk: bcm2835: Fix ->fixed_divider of pllh_aux (diff) | |
| parent | clk: bcm: Fix unmet Kconfig dependencies for CLK_BCM_63XX (diff) | |
| download | linux-dev-5e2035b90e7192b48f9615ddfbcc6fef1149ed8a.tar.xz linux-dev-5e2035b90e7192b48f9615ddfbcc6fef1149ed8a.zip | |
Merge branch 'clk-fixes' into clk-next
* clk-fixes:
clk: bcm: Fix unmet Kconfig dependencies for CLK_BCM_63XX
clk: sunxi-ng: enable so-said LDOs for A33 SoC's pll-mipi clock
clk: sunxi-ng: sun6i-a31: Enable PLL-MIPI LDOs when ungating it
Diffstat (limited to 'drivers/clk/bcm')
| -rw-r--r-- | drivers/clk/bcm/Kconfig | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/clk/bcm/Kconfig b/drivers/clk/bcm/Kconfig index f21e9b7afd1a..e3eed5a78404 100644 --- a/drivers/clk/bcm/Kconfig +++ b/drivers/clk/bcm/Kconfig @@ -20,7 +20,7 @@ config CLK_BCM_KONA config COMMON_CLK_IPROC bool "Broadcom iProc clock support" - depends on ARCH_BCM_IPROC || COMPILE_TEST + depends on ARCH_BCM_IPROC || ARCH_BCM_63XX || COMPILE_TEST depends on COMMON_CLK default ARCH_BCM_IPROC help |