diff options
| author | Michael Turquette <mturquette@linaro.org> | 2015-06-03 15:22:03 -0700 |
|---|---|---|
| committer | Michael Turquette <mturquette@linaro.org> | 2015-06-03 15:22:03 -0700 |
| commit | ae8d4048fada71a77144e0f05e8612f90b9501f0 (patch) | |
| tree | d911226fa3a204d139cbc136e7d1bb1bba4711b3 /drivers/clk/hisilicon/Makefile | |
| parent | 19fbbbbcd3a3a8e307a4768784166abf7b55b779 (diff) | |
| parent | 72ea48610d43c59507d9ad39083d40085400ba12 (diff) | |
| download | linux-ae8d4048fada71a77144e0f05e8612f90b9501f0.tar.bz2 | |
Merge branch 'clk-next-hi6220' into clk-next
Conflicts:
drivers/clk/Kconfig
Diffstat (limited to 'drivers/clk/hisilicon/Makefile')
| -rw-r--r-- | drivers/clk/hisilicon/Makefile | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/clk/hisilicon/Makefile b/drivers/clk/hisilicon/Makefile index 038c02f4d0e7..48f0116a032a 100644 --- a/drivers/clk/hisilicon/Makefile +++ b/drivers/clk/hisilicon/Makefile @@ -2,8 +2,9 @@ # Hisilicon Clock specific Makefile # -obj-y += clk.o clkgate-separated.o +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_HI6220) += clk-hi6220.o |