---

yaml --- r: 308147 b: refs/heads/master c: 256aa5f h: refs/heads/master i: 308145: 15afcdd 308143: cf791d7 v: v3
git-mirror · May 8, 2012 · 795740d · 795740d
1 parent a501eba
commit 795740d
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 4 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: d07c3df8019bf01306065c4271421d70ad23e5e8
+refs/heads/master: 256aa5fc239d7c1986dd47b88c6297d582e7763c
diff --git a/trunk/arch/arm/Makefile b/trunk/arch/arm/Makefile
@@ -164,9 +164,7 @@ machine-$(CONFIG_ARCH_MXS)		:= mxs
 machine-$(CONFIG_ARCH_NETX)		:= netx
 machine-$(CONFIG_ARCH_NOMADIK)		:= nomadik
 machine-$(CONFIG_ARCH_OMAP1)		:= omap1
-machine-$(CONFIG_ARCH_OMAP2)		:= omap2
-machine-$(CONFIG_ARCH_OMAP3)		:= omap2
-machine-$(CONFIG_ARCH_OMAP4)		:= omap2
+machine-$(CONFIG_ARCH_OMAP2PLUS)	:= omap2
 machine-$(CONFIG_ARCH_ORION5X)		:= orion5x
 machine-$(CONFIG_ARCH_PICOXCELL)	:= picoxcell
 machine-$(CONFIG_ARCH_PNX4008)		:= pnx4008