From: Tony Lindgren <tony@atomide.com>
Date: Thu, 28 May 2009 22:45:07 +0000 (-0700)
Subject: Merge branch 'omap3-boards' into for-next
X-Git-Tag: firefly_0821_release~13644^2~4^2~10
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=4c50d22a0cf240918d53afbf9a8416a9d93aacee;p=firefly-linux-kernel-4.4.55.git

Merge branch 'omap3-boards' into for-next
---

4c50d22a0cf240918d53afbf9a8416a9d93aacee
diff --cc arch/arm/mach-omap2/Makefile
index 516477ee5690,10e7c29ac1db..c48b12c0fe2d
--- a/arch/arm/mach-omap2/Makefile
+++ b/arch/arm/mach-omap2/Makefile
@@@ -55,9 -55,13 +57,11 @@@ obj-$(CONFIG_MACH_OMAP_3430SDP)		+= boa
  obj-$(CONFIG_MACH_NOKIA_RX51)		+= board-rx51.o \
  					   board-rx51-peripherals.o \
  					   mmc-twl4030.o
- 
+ obj-$(CONFIG_MACH_OMAP_ZOOM2)		+= board-zoom2.o \
+ 					   mmc-twl4030.o \
+ 					   board-zoom-debugboard.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)