diff options
| author | Stephen Boyd <sboyd@codeaurora.org> | 2015-10-21 17:28:19 -0700 |
|---|---|---|
| committer | Stephen Boyd <sboyd@codeaurora.org> | 2015-10-21 17:28:19 -0700 |
| commit | f63d19ef52aa66e97fca2425974845177ce02b0a (patch) | |
| tree | 53ec668d90828b5a4144ef445df347e6fea19ae5 /drivers/clk/bcm/Kconfig | |
| parent | 938ce30e29dcb8ca0b1bf375305485ed17f40062 (diff) | |
| parent | 0064c862340626400a56d72e5e86f01ef0d5a498 (diff) | |
| download | linux-f63d19ef52aa66e97fca2425974845177ce02b0a.tar.gz | |
Merge branch 'clk-iproc' into clk-next
* clk-iproc: clk: iproc: define Broadcom NS2 iProc clock binding clk: iproc: define Broadcom NSP iProc clock binding clk: ns2: add clock support for Broadcom Northstar 2 SoC clk: iproc: Separate status and control variables clk: iproc: Split off dig_filter clk: iproc: Add PLL base write function clk: nsp: add clock support for Broadcom Northstar Plus SoC clk: iproc: Add PWRCTRL support clk: cygnus: Convert all macros to all caps ARM: cygnus: fix link failures when CONFIG_COMMON_CLK_IPROC is disabled
Diffstat (limited to 'drivers/clk/bcm/Kconfig')
| -rw-r--r-- | drivers/clk/bcm/Kconfig | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/drivers/clk/bcm/Kconfig b/drivers/clk/bcm/Kconfig index 561e9dc6d40d..85260fb96b36 100644 --- a/drivers/clk/bcm/Kconfig +++ b/drivers/clk/bcm/Kconfig @@ -9,10 +9,8 @@ config CLK_BCM_KONA in the BCM281xx and BCM21664 families. config COMMON_CLK_IPROC - bool "Broadcom iProc clock support" - depends on ARCH_BCM_IPROC || COMPILE_TEST + bool depends on COMMON_CLK - default ARCH_BCM_IPROC help Enable common clock framework support for Broadcom SoCs based on the iProc architecture |