diff options
| author | Stephen Boyd <sboyd@kernel.org> | 2018-10-18 15:43:24 -0700 |
|---|---|---|
| committer | Stephen Boyd <sboyd@kernel.org> | 2018-10-18 15:43:24 -0700 |
| commit | 19ef24654f2ef3f4392a8df431eccf8f42ac4878 (patch) | |
| tree | 0bbd8735e7e3ffd7ce89d1b0c2fee481e602f8ed /drivers/clk/Makefile | |
| parent | fa4c0e490387fc1eec6a7109450a7dfde24e419a (diff) | |
| parent | 226dfa4726ebb102479d668e01160a1dc77485e8 (diff) | |
Merge branch 'clk-ingenic-jz4725b' into clk-next
- Ingenic jz4725b CGU
* clk-ingenic-jz4725b:
clk: Add Ingenic jz4725b CGU driver
dt-bindings: clock: Add jz4725b-cgu.h header
dt-bindings: clock: ingenic: Explicitly list compatible strings
clk: ingenic: Add proper Kconfig entries
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 ed344eb717cc..b49d54fc0599 100644 --- a/drivers/clk/Makefile +++ b/drivers/clk/Makefile @@ -72,7 +72,7 @@ obj-$(CONFIG_H8300) += h8300/ obj-$(CONFIG_ARCH_HISI) += hisilicon/ obj-y += imgtec/ obj-$(CONFIG_ARCH_MXC) += imx/ -obj-$(CONFIG_MACH_INGENIC) += ingenic/ +obj-y += ingenic/ obj-$(CONFIG_ARCH_K3) += keystone/ obj-$(CONFIG_ARCH_KEYSTONE) += keystone/ obj-$(CONFIG_MACH_LOONGSON32) += loongson1/ |