From: Russell King <rmk@dyn-67.arm.linux.org.uk>
Date: Sat, 12 Sep 2009 10:50:52 +0000 (+0100)
Subject: Merge branch 'nomadik' into devel-stable
X-Git-Tag: v2.6.32-rc1~691^2~1^2~1
X-Git-Url: https://git.kernel.dk/?a=commitdiff_plain;h=701038144945ef98c5817f43079952fa38c35999;p=linux-2.6-block.git

Merge branch 'nomadik' into devel-stable
---

701038144945ef98c5817f43079952fa38c35999
diff --cc arch/arm/Makefile
index 3de196e2a7a7,97cca075d0f9..b70f62c8fc0a
--- a/arch/arm/Makefile
+++ b/arch/arm/Makefile
@@@ -142,9 -135,9 +142,10 @@@ machine-$(CONFIG_ARCH_MSM)		:= ms
  machine-$(CONFIG_ARCH_MV78XX0)		:= mv78xx0
  machine-$(CONFIG_ARCH_MX1)		:= mx1
  machine-$(CONFIG_ARCH_MX2)		:= mx2
 +machine-$(CONFIG_ARCH_MX25)		:= mx25
  machine-$(CONFIG_ARCH_MX3)		:= mx3
  machine-$(CONFIG_ARCH_NETX)		:= netx
+ machine-$(CONFIG_ARCH_NOMADIK)		:= nomadik
  machine-$(CONFIG_ARCH_NS9XXX)		:= ns9xxx
  machine-$(CONFIG_ARCH_OMAP1)		:= omap1
  machine-$(CONFIG_ARCH_OMAP2)		:= omap2