diff options
| author | Kevin Hilman <khilman@linaro.org> | 2015-06-12 02:19:29 +0300 |
|---|---|---|
| committer | Kevin Hilman <khilman@linaro.org> | 2015-06-12 02:19:29 +0300 |
| commit | 4d48614ec45aa20d6a2cb7d2eb1368d7641c747d (patch) | |
| tree | b1ff786973cb65fd3c4df4bf9cdf652f4d05f96c /drivers/clk/Makefile | |
| parent | 259f47eb4411c2e7f50372bb388c074d5729cca2 (diff) | |
| parent | 405817f6780e18a9c4dc80a5883688df969608e8 (diff) | |
| download | linux-4d48614ec45aa20d6a2cb7d2eb1368d7641c747d.tar.xz | |
Merge branch 'zte/soc' into next/soc
* zte/soc:
ARM: zx: Add basic defconfig support for ZX296702
ARM: dts: zx: add an initial zx296702 dts and doc
clk: zx: add clock support to zx296702
dt-bindings: Add #defines for ZTE ZX296702 clocks
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 d7a507f0c44c..4dcbdd36f24e 100644 --- a/drivers/clk/Makefile +++ b/drivers/clk/Makefile @@ -73,4 +73,5 @@ obj-$(CONFIG_ARCH_OMAP2PLUS) += ti/ obj-$(CONFIG_ARCH_U8500) += ux500/ obj-$(CONFIG_COMMON_CLK_VERSATILE) += versatile/ obj-$(CONFIG_X86) += x86/ +obj-$(CONFIG_ARCH_ZX) += zte/ obj-$(CONFIG_ARCH_ZYNQ) += zynq/ |