From: Tony Lindgren <tony@atomide.com>
Date: Thu, 28 May 2009 22:41:03 +0000 (-0700)
Subject: Merge branch 'omap-upstream' into for-next
X-Git-Tag: v2.6.31-rc1~344^2~23^2~3
X-Git-Url: https://openfabrics.org/gitweb/?a=commitdiff_plain;h=c81592ba1b012d555d0cb7ec711afda89c327469;p=~shefty%2Frdma-dev.git

Merge branch 'omap-upstream' into for-next

Conflicts:
	arch/arm/mach-omap2/Makefile
---

c81592ba1b012d555d0cb7ec711afda89c327469
diff --cc arch/arm/mach-omap2/Makefile
index 3935a359e7e,e4f6f61c40e..516477ee569
--- a/arch/arm/mach-omap2/Makefile
+++ b/arch/arm/mach-omap2/Makefile
@@@ -57,4 -55,12 +57,10 @@@ obj-$(CONFIG_MACH_NOKIA_RX51)		+= board
  					   mmc-twl4030.o
  
  # Platform specific device init code
 -ifeq ($(CONFIG_USB_MUSB_SOC),y)
  obj-y					+= usb-musb.o
 -endif
+ 
+ onenand-$(CONFIG_MTD_ONENAND_OMAP2)	:= gpmc-onenand.o
+ obj-y					+= $(onenand-m) $(onenand-y)
+ 
+ smc91x-$(CONFIG_SMC91X)			:= gpmc-smc91x.o
+ obj-y					+= $(smc91x-m) $(smc91x-y)