diff options
author | Kevin Hilman <khilman@linaro.org> | 2013-12-20 17:59:04 +0100 |
---|---|---|
committer | Kevin Hilman <khilman@linaro.org> | 2013-12-20 17:59:30 +0100 |
commit | 490b929d42d2a321887f9538a83fc9f215675f15 (patch) | |
tree | 04fe7161f92c568839605f92c8f1c8730216f739 /arch/arm/boot/dts/Makefile | |
parent | Merge branch 'berlin/soc' into next/soc (diff) | |
parent | ARM: device trees for Energy Micro's EFM32 Cortex-M3 SoCs (diff) | |
download | linux-490b929d42d2a321887f9538a83fc9f215675f15.tar.xz 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/boot/dts/Makefile')
-rw-r--r-- | arch/arm/boot/dts/Makefile | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/arm/boot/dts/Makefile b/arch/arm/boot/dts/Makefile index 5c92212ee3a7..e1bf28743b98 100644 --- a/arch/arm/boot/dts/Makefile +++ b/arch/arm/boot/dts/Makefile @@ -55,6 +55,7 @@ dtb-$(CONFIG_ARCH_DOVE) += dove-cm-a510.dtb \ dove-d2plug.dtb \ dove-d3plug.dtb \ dove-dove-db.dtb +dtb-$(CONFIG_ARCH_EFM32) += efm32gg-dk3750.dtb dtb-$(CONFIG_ARCH_EXYNOS) += exynos4210-origen.dtb \ exynos4210-smdkv310.dtb \ exynos4210-trats.dtb \ |