commit 949abd84cd54ff864efca9df822d1e02a56694ec
author Russell King <rmk@dyn-67.arm.linux.org.uk> Fri May 29 20:03:43 2009 +0100
committer Russell King <rmk+kernel@arm.linux.org.uk> Fri May 29 20:03:43 2009 +0100
tree 0c0e7696a51e2989f11a37478ff26368cab0e227
parent b0958aed1ea39825439a7848544bfb2e267273b4
parent cd07ecc828486e5887113c7dc4d9f9022145811b

Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap-2.6 into devel

Conflicts:
	arch/arm/Makefile

arch/arm/Makefile

diff --git a/arch/arm/Makefile b/arch/arm/Makefile
index b6b9f6e..e8ab877 100644
--- a/arch/arm/Makefile
+++ b/arch/arm/Makefile
@@ -138,6 +138,7 @@
 machine-$(CONFIG_ARCH_OMAP1)		:= omap1
 machine-$(CONFIG_ARCH_OMAP2)		:= omap2
 machine-$(CONFIG_ARCH_OMAP3)		:= omap2
+machine-$(CONFIG_ARCH_OMAP4)		:= omap2
 machine-$(CONFIG_ARCH_ORION5X)		:= orion5x
 machine-$(CONFIG_ARCH_PNX4008)		:= pnx4008
 machine-$(CONFIG_ARCH_PXA)		:= pxa