summaryrefslogtreecommitdiffstats
path: root/arch/arm/Makefile
diff options
context:
space:
mode:
authorKevin Hilman <khilman@linaro.org>2013-12-20 08:59:04 -0800
committerKevin Hilman <khilman@linaro.org>2013-12-20 08:59:30 -0800
commit490b929d42d2a321887f9538a83fc9f215675f15 (patch)
tree04fe7161f92c568839605f92c8f1c8730216f739 /arch/arm/Makefile
parent23621799f24c3c4e8e8dcdf5fdeb3ebd2be148f9 (diff)
parentef43eff3447f30b4a3cfc61813902c2e57c20245 (diff)
downloadblackbird-op-linux-490b929d42d2a321887f9538a83fc9f215675f15.tar.gz
blackbird-op-linux-490b929d42d2a321887f9538a83fc9f215675f15.zip
Merge branch 'efm32/soc' into next/soc
From Uwe Kleine-König: * efm32/soc: (1003 commits) ARM: device trees for Energy Micro's EFM32 Cortex-M3 SoCs ARM: new platform for Energy Micro's EFM32 Cortex-M3 SoCs +Linux 3.13-rc4 Signed-off-by: Kevin Hilman <khilman@linaro.org>
Diffstat (limited to 'arch/arm/Makefile')
-rw-r--r--arch/arm/Makefile1
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/arm/Makefile b/arch/arm/Makefile
index 483abc7a9834..b2f8222bb6c4 100644
--- a/arch/arm/Makefile
+++ b/arch/arm/Makefile
@@ -154,6 +154,7 @@ machine-$(CONFIG_ARCH_CNS3XXX) += cns3xxx
machine-$(CONFIG_ARCH_DAVINCI) += davinci
machine-$(CONFIG_ARCH_DOVE) += dove
machine-$(CONFIG_ARCH_EBSA110) += ebsa110
+machine-$(CONFIG_ARCH_EFM32) += efm32
machine-$(CONFIG_ARCH_EP93XX) += ep93xx
machine-$(CONFIG_ARCH_EXYNOS) += exynos
machine-$(CONFIG_ARCH_GEMINI) += gemini
OpenPOWER on IntegriCloud