diff options
| author | Russell King <rmk@dyn-67.arm.linux.org.uk> | 2009-03-25 14:31:35 -0400 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2009-03-25 14:31:35 -0400 |
| commit | 8937b7349ca9e25a02b2a72ccb7fba404ddedc5b (patch) | |
| tree | 434ffe23d318f8af55850a26c3431ce8b82ab6f4 /arch/arm/mach-omap2/Makefile | |
| parent | 997302259f386bca8fe1db67c50296ca426c438f (diff) | |
| parent | ffe7f95bb1a4d1e9ca5d252445dc38476e1a208e (diff) | |
Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap-2.6 into devel
Diffstat (limited to 'arch/arm/mach-omap2/Makefile')
| -rw-r--r-- | arch/arm/mach-omap2/Makefile | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/arch/arm/mach-omap2/Makefile b/arch/arm/mach-omap2/Makefile index 9717afcdbda7..a2c3fcc27a22 100644 --- a/arch/arm/mach-omap2/Makefile +++ b/arch/arm/mach-omap2/Makefile | |||
| @@ -42,4 +42,12 @@ obj-$(CONFIG_MACH_OVERO) += board-overo.o \ | |||
| 42 | mmc-twl4030.o | 42 | mmc-twl4030.o |
| 43 | obj-$(CONFIG_MACH_OMAP3_PANDORA) += board-omap3pandora.o \ | 43 | obj-$(CONFIG_MACH_OMAP3_PANDORA) += board-omap3pandora.o \ |
| 44 | mmc-twl4030.o | 44 | mmc-twl4030.o |
| 45 | obj-$(CONFIG_MACH_OMAP_3430SDP) += board-3430sdp.o \ | ||
| 46 | mmc-twl4030.o | ||
| 45 | 47 | ||
| 48 | obj-$(CONFIG_MACH_NOKIA_RX51) += board-rx51.o \ | ||
| 49 | board-rx51-peripherals.o \ | ||
| 50 | # Platform specific device init code | ||
| 51 | ifeq ($(CONFIG_USB_MUSB_SOC),y) | ||
| 52 | obj-y += usb-musb.o | ||
| 53 | endif | ||