Merge branch 'efm32/soc' into next/soc

[~andy/linux] / arch / arm / Makefile

diff --git a/arch/arm/Makefile b/arch/arm/Makefile
index 6da9abb30460fd97500c8a11fe4beabf763058e8..b2f8222bb6c4843df868cb6e8d925d427754a3fc 100644 (file)
--- a/arch/arm/Makefile
+++ b/arch/arm/Makefile
@@ -148,6 +148,7 @@ textofs-$(CONFIG_ARCH_MSM8960) := 0x00208000
 machine-$(CONFIG_ARCH_AT91)            += at91
 machine-$(CONFIG_ARCH_BCM)             += bcm
 machine-$(CONFIG_ARCH_BCM2835)         += bcm2835
+machine-$(CONFIG_ARCH_BERLIN)          += berlin
 machine-$(CONFIG_ARCH_CLPS711X)                += clps711x
 machine-$(CONFIG_ARCH_CNS3XXX)         += cns3xxx
 machine-$(CONFIG_ARCH_DAVINCI)         += davinci