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

[linux-2.6-omap-h63xx.git] / arch / arm / mach-omap2 / Makefile

diff --git a/arch/arm/mach-omap2/Makefile b/arch/arm/mach-omap2/Makefile
index 9717afcdbda74dc7eae25078330a28146e7aea89..a2c3fcc27a22990e4d1a2f3220b3d6a079100148 100644 (file)
--- a/arch/arm/mach-omap2/Makefile
+++ b/arch/arm/mach-omap2/Makefile
@@ -42,4 +42,12 @@ obj-$(CONFIG_MACH_OVERO)             += board-overo.o \
                                           mmc-twl4030.o
 obj-$(CONFIG_MACH_OMAP3_PANDORA)       += board-omap3pandora.o \
                                           mmc-twl4030.o
+obj-$(CONFIG_MACH_OMAP_3430SDP)                += board-3430sdp.o \
+                                          mmc-twl4030.o
 
+obj-$(CONFIG_MACH_NOKIA_RX51)          += board-rx51.o \
+                                          board-rx51-peripherals.o \
+# Platform specific device init code
+ifeq ($(CONFIG_USB_MUSB_SOC),y)
+obj-y                                  += usb-musb.o
+endif