diff options
| author | Stephen Boyd <sboyd@codeaurora.org> | 2016-05-06 21:21:23 +0300 |
|---|---|---|
| committer | Stephen Boyd <sboyd@codeaurora.org> | 2016-05-06 21:21:23 +0300 |
| commit | f3bf9841b837cba56d1e42d510c59623f14de3e4 (patch) | |
| tree | c22e8d7cc2ab6f67bfbec570f0434166a6e76ef6 /drivers/clk/hisilicon/Makefile | |
| parent | 4087a5f2e5e75a6d0231d1318bada1a12972a5fd (diff) | |
| parent | 6c9da387c8d5c5254857d2782bd6c314226f4f27 (diff) | |
| download | linux-f3bf9841b837cba56d1e42d510c59623f14de3e4.tar.xz | |
Merge branch 'clk-hi3519' into clk-next
* clk-hi3519:
clk: hisilicon: add CRG driver for hi3519 soc
clk: hisilicon: export some hisilicon APIs to modules
reset: hisilicon: add reset controller driver for hisilicon SOCs
Diffstat (limited to 'drivers/clk/hisilicon/Makefile')
| -rw-r--r-- | drivers/clk/hisilicon/Makefile | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/clk/hisilicon/Makefile b/drivers/clk/hisilicon/Makefile index 74dba31590f9..e169ec7da023 100644 --- a/drivers/clk/hisilicon/Makefile +++ b/drivers/clk/hisilicon/Makefile @@ -7,5 +7,7 @@ obj-y += clk.o clkgate-separated.o clkdivider-hi6220.o obj-$(CONFIG_ARCH_HI3xxx) += clk-hi3620.o obj-$(CONFIG_ARCH_HIP04) += clk-hip04.o obj-$(CONFIG_ARCH_HIX5HD2) += clk-hix5hd2.o +obj-$(CONFIG_COMMON_CLK_HI3519) += clk-hi3519.o obj-$(CONFIG_COMMON_CLK_HI6220) += clk-hi6220.o +obj-$(CONFIG_RESET_HISI) += reset.o obj-$(CONFIG_STUB_CLK_HI6220) += clk-hi6220-stub.o |