From 795740db8be5906be318ce67b9aad646d7246455 Mon Sep 17 00:00:00 2001 From: Santosh Shilimkar Date: Sat, 28 Apr 2012 20:25:31 +0530 Subject: [PATCH] --- yaml --- r: 308147 b: refs/heads/master c: 256aa5fc239d7c1986dd47b88c6297d582e7763c h: refs/heads/master i: 308145: 15afcdd57dd7be3f85df78c2048b3bdf57359116 308143: cf791d7bc58b64ded1fdfc4baacb62be55f3f1aa v: v3 --- [refs] | 2 +- trunk/arch/arm/Makefile | 4 +--- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/[refs] b/[refs] index c5aa753d905e..33a5881bce11 100644 --- 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 index 047a20780fc1..7a6bde07e787 100644 --- 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