diff options
| author | Stephen Boyd <sboyd@codeaurora.org> | 2017-06-02 15:39:32 -0700 |
|---|---|---|
| committer | Stephen Boyd <sboyd@codeaurora.org> | 2017-06-02 15:39:32 -0700 |
| commit | 887541159c5e4a89779c021553f89df9596ddd94 (patch) | |
| tree | ab1be02395a9d14b7518d3a08bd2059d4912ba82 /drivers/clk/Makefile | |
| parent | c3c4cb8d627731b8cfe906431f1b64b056197055 (diff) | |
| parent | 618aee02e2f57042f4cdeab228caf631e524b281 (diff) | |
| download | linux-stable-887541159c5e4a89779c021553f89df9596ddd94.tar.gz linux-stable-887541159c5e4a89779c021553f89df9596ddd94.tar.bz2 linux-stable-887541159c5e4a89779c021553f89df9596ddd94.zip | |
Merge branch 'clk-bulk-get' into clk-next
* clk-bulk-get:
clk: add managed version of clk_bulk_get
clk: add clk_bulk_get accessories
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 8ea0c55645b0..9c72096c556e 100644 --- a/drivers/clk/Makefile +++ b/drivers/clk/Makefile @@ -1,5 +1,5 @@ # common clock types -obj-$(CONFIG_HAVE_CLK) += clk-devres.o +obj-$(CONFIG_HAVE_CLK) += clk-devres.o clk-bulk.o obj-$(CONFIG_CLKDEV_LOOKUP) += clkdev.o obj-$(CONFIG_COMMON_CLK) += clk.o obj-$(CONFIG_COMMON_CLK) += clk-divider.o |