diff options
| author | Stephen Boyd <sboyd@codeaurora.org> | 2015-10-12 11:44:49 -0700 |
|---|---|---|
| committer | Stephen Boyd <sboyd@codeaurora.org> | 2015-10-12 11:44:49 -0700 |
| commit | 67d7188afe23e4b1b82ee6fed35c14387f169f74 (patch) | |
| tree | ec3fe1c511b34c89626745b08bbd46c4c6d7a8a4 /drivers/clk/Makefile | |
| parent | 53c929c922ccc5e615c3310e86ffbc1387372854 (diff) | |
| parent | 41691b8862e2a32080306f17a723efc4b6ca86ab (diff) | |
| download | linux-67d7188afe23e4b1b82ee6fed35c14387f169f74.tar.gz linux-67d7188afe23e4b1b82ee6fed35c14387f169f74.tar.bz2 linux-67d7188afe23e4b1b82ee6fed35c14387f169f74.zip | |
Merge branch 'clk-bcm2835' into clk-next
* clk-bcm2835:
clk: bcm2835: Add support for programming the audio domain clocks
clk: bcm2835: Add binding docs for the new platform clock driver.
clk: bcm2835: Move under bcm/ with other Broadcom SoC clk drivers.
Diffstat (limited to 'drivers/clk/Makefile')
| -rw-r--r-- | drivers/clk/Makefile | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/drivers/clk/Makefile b/drivers/clk/Makefile index 6594e53a4444..e44feca7a1ac 100644 --- a/drivers/clk/Makefile +++ b/drivers/clk/Makefile @@ -19,7 +19,6 @@ endif obj-$(CONFIG_MACH_ASM9260) += clk-asm9260.o obj-$(CONFIG_COMMON_CLK_AXI_CLKGEN) += clk-axi-clkgen.o obj-$(CONFIG_ARCH_AXXIA) += clk-axm5516.o -obj-$(CONFIG_ARCH_BCM2835) += clk-bcm2835.o obj-$(CONFIG_COMMON_CLK_CDCE706) += clk-cdce706.o obj-$(CONFIG_ARCH_CLPS711X) += clk-clps711x.o obj-$(CONFIG_ARCH_EFM32) += clk-efm32gg.o |