diff options
| author | Kevin Hilman <khilman@linaro.org> | 2014-01-08 13:55:26 -0800 |
|---|---|---|
| committer | Kevin Hilman <khilman@linaro.org> | 2014-01-08 13:55:33 -0800 |
| commit | d0f2a5ba07ac8dc671c0acb89d0114352b41e936 (patch) | |
| tree | 8b1e1594553dbb6a8480bc8d033d2bb0077f41fc /arch/arm/Makefile | |
| parent | e05f9ac42c1b87a1a266e3e83191ed00211576bc (diff) | |
| parent | 0cfb1c8bec551c8eb7c6b263baebc9537d2b910c (diff) | |
| download | lwn-d0f2a5ba07ac8dc671c0acb89d0114352b41e936.tar.gz lwn-d0f2a5ba07ac8dc671c0acb89d0114352b41e936.zip | |
Merge branch 'hisi/soc' into next/soc
* hisi/soc:
ARM: dts: rename hi4511 dts file
ARM: hisi: remove init_time
ARM: hisi: rename hi3xxx to hisi
ARM: dts: enable clock binding on Hi3620
ARM: hi3xxx: add hotplug support
ARM: hi3xxx: add smp support
ARM: config: add defconfig for Hi3xxx
ARM: config: enable hi3xxx in multi_v7_defconfig
ARM: dts: enable hi4511 with device tree
ARM: hi3xxx: add board support with device tree
Signed-off-by: Kevin Hilman <khilman@linaro.org>
Diffstat (limited to 'arch/arm/Makefile')
| -rw-r--r-- | arch/arm/Makefile | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/arm/Makefile b/arch/arm/Makefile index 91b16ce35a6c..e47c09bd23bd 100644 --- a/arch/arm/Makefile +++ b/arch/arm/Makefile @@ -159,6 +159,7 @@ machine-$(CONFIG_ARCH_EP93XX) += ep93xx machine-$(CONFIG_ARCH_EXYNOS) += exynos machine-$(CONFIG_ARCH_GEMINI) += gemini machine-$(CONFIG_ARCH_HIGHBANK) += highbank +machine-$(CONFIG_ARCH_HI3xxx) += hisi machine-$(CONFIG_ARCH_INTEGRATOR) += integrator machine-$(CONFIG_ARCH_IOP13XX) += iop13xx machine-$(CONFIG_ARCH_IOP32X) += iop32x |