Merge current mainline tree into linux-omap tree

[linux-2.6-omap-h63xx.git] / arch / arm / Makefile

diff --git a/arch/arm/Makefile b/arch/arm/Makefile
index 83eb16aece824490133526d87eb86380a263c976..cc43dec29236c05bcdf2bb0fcbcf38a8d07af5bd 100644 (file)
--- a/arch/arm/Makefile
+++ b/arch/arm/Makefile
@@ -140,6 +140,8 @@ endif
  machine-$(CONFIG_ARCH_KS8695)     := ks8695
   incdir-$(CONFIG_ARCH_MXC)       := mxc
  machine-$(CONFIG_ARCH_MX3)       := mx3
+ machine-$(CONFIG_ARCH_ORION)     := orion
+ machine-$(CONFIG_ARCH_MSM7X00A)   := msm
 
 ifeq ($(CONFIG_ARCH_EBSA110),y)
 # This is what happens if you forget the IOCS16 line.