Merge tag 'soc' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc

[pandora-kernel.git] / arch / arm / Makefile

diff --git a/arch/arm/Makefile b/arch/arm/Makefile
index 20d295a..9c60f47 100644 (file)
--- a/arch/arm/Makefile
+++ b/arch/arm/Makefile
@@ -138,6 +138,7 @@ textofs-$(CONFIG_ARCH_MSM8960) := 0x00208000
 # Machine directory name.  This list is sorted alphanumerically
 # by CONFIG_* macro name.
 machine-$(CONFIG_ARCH_AT91)            += at91
+machine-$(CONFIG_ARCH_BCM)             += bcm
 machine-$(CONFIG_ARCH_BCM2835)         += bcm2835
 machine-$(CONFIG_ARCH_CLPS711X)                += clps711x
 machine-$(CONFIG_ARCH_CNS3XXX)         += cns3xxx
@@ -194,6 +195,7 @@ machine-$(CONFIG_ARCH_SPEAR13XX)    += spear13xx
 machine-$(CONFIG_ARCH_SPEAR3XX)                += spear3xx
 machine-$(CONFIG_MACH_SPEAR600)                += spear6xx
 machine-$(CONFIG_ARCH_ZYNQ)            += zynq
+machine-$(CONFIG_ARCH_SUNXI)           += sunxi
 
 # Platform directory name.  This list is sorted alphanumerically
 # by CONFIG_* macro name.