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/Makefile | |
| parent | 938ce30e29dcb8ca0b1bf375305485ed17f40062 (diff) | |
| parent | 0064c862340626400a56d72e5e86f01ef0d5a498 (diff) | |
| download | linux-f63d19ef52aa66e97fca2425974845177ce02b0a.tar.bz2 | |
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/Makefile')
| -rw-r--r-- | drivers/clk/Makefile | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/clk/Makefile b/drivers/clk/Makefile index 58fd167c462a..d3e1910eebab 100644 --- a/drivers/clk/Makefile +++ b/drivers/clk/Makefile @@ -48,7 +48,7 @@ obj-$(CONFIG_COMMON_CLK_WM831X) += clk-wm831x.o obj-$(CONFIG_COMMON_CLK_XGENE) += clk-xgene.o obj-$(CONFIG_COMMON_CLK_PWM) += clk-pwm.o obj-$(CONFIG_COMMON_CLK_AT91) += at91/ -obj-$(CONFIG_ARCH_BCM) += bcm/ +obj-y += bcm/ obj-$(CONFIG_ARCH_BERLIN) += berlin/ obj-$(CONFIG_ARCH_HISI) += hisilicon/ obj-$(CONFIG_ARCH_MXC) += imx/ |