diff options
| author |   Stephen Boyd <sboyd@codeaurora.org> | 2016-04-15 16:02:46 -0700 |
|---|---|---|
| committer | Stephen Boyd <sboyd@codeaurora.org> | 2016-04-15 16:02:46 -0700 |
| commit | 75ff88888093eddca478a8fa1b77b30edb4fa8be (patch) | |
| tree | 97990ff554f2e37084fa69a8fee891c13eb287be /drivers/clk/Makefile | |
| parent | clk: ti: dflt: remove redundant unlikely (diff) | |
| parent | clk: add artpec-6 clock controller (diff) | |
| download | linux-dev-75ff88888093eddca478a8fa1b77b30edb4fa8be.tar.xz linux-dev-75ff88888093eddca478a8fa1b77b30edb4fa8be.zip | |
Merge branch 'clk-artpec6' into clk-next
* clk-artpec6:
clk: add artpec-6 clock controller
clk: add device tree binding for Artpec-6 clock controller
Diffstat (limited to 'drivers/clk/Makefile')
| -rw-r--r-- | drivers/clk/Makefile | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/clk/Makefile b/drivers/clk/Makefile index f9ad66e60b48..54964eb43195 100644 --- a/drivers/clk/Makefile +++ b/drivers/clk/Makefile @@ -51,6 +51,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_ARTPEC) += axis/ obj-y += bcm/ obj-$(CONFIG_ARCH_BERLIN) += berlin/ obj-$(CONFIG_ARCH_HISI) += hisilicon/ |