Merge branch 'omap3-boards' into for-next

diff --cc arch/arm/mach-omap2/Makefile
index 516477ee56902361be0d88fa06c015d9725963cb,10e7c29ac1db2791bdddbde70fb58ee14b6f1c9a..c48b12c0fe2d75e33da37629518066f4549e1a8a
--- 1/arch/arm/mach-omap2/Makefile
--- 2/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)