Merge tag 'xfs-for-linus-3.18-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git...

[deliverable/linux.git] / arch / arm / Makefile

diff --git a/arch/arm/Makefile b/arch/arm/Makefile
index 0ce9d0f71f2a318c240e60ab019d155dc94e6925..dceb0441b1a6de111eb5cc3e9b96e1bbb5e69f34 100644 (file)
--- a/arch/arm/Makefile
+++ b/arch/arm/Makefile
@@ -157,6 +157,7 @@ machine-$(CONFIG_ARCH_EBSA110)              += ebsa110
 machine-$(CONFIG_ARCH_EFM32)           += efm32
 machine-$(CONFIG_ARCH_EP93XX)          += ep93xx
 machine-$(CONFIG_ARCH_EXYNOS)          += exynos
+machine-$(CONFIG_ARCH_FOOTBRIDGE)      += footbridge
 machine-$(CONFIG_ARCH_GEMINI)          += gemini
 machine-$(CONFIG_ARCH_HIGHBANK)                += highbank
 machine-$(CONFIG_ARCH_HISI)            += hisi
@@ -168,6 +169,7 @@ machine-$(CONFIG_ARCH_IXP4XX)               += ixp4xx
 machine-$(CONFIG_ARCH_KEYSTONE)                += keystone
 machine-$(CONFIG_ARCH_KS8695)          += ks8695
 machine-$(CONFIG_ARCH_LPC32XX)         += lpc32xx
+machine-$(CONFIG_ARCH_MESON)           += meson
 machine-$(CONFIG_ARCH_MMP)             += mmp
 machine-$(CONFIG_ARCH_MOXART)          += moxart
 machine-$(CONFIG_ARCH_MSM)             += msm
@@ -205,7 +207,6 @@ machine-$(CONFIG_ARCH_VEXPRESS)             += vexpress
 machine-$(CONFIG_ARCH_VT8500)          += vt8500
 machine-$(CONFIG_ARCH_W90X900)         += w90x900
 machine-$(CONFIG_ARCH_ZYNQ)            += zynq
-machine-$(CONFIG_FOOTBRIDGE)           += footbridge
 machine-$(CONFIG_PLAT_SPEAR)           += spear
 
 # Platform directory name.  This list is sorted alphanumerically