diff options
| author | Tony Lindgren <tony@atomide.com> | 2009-05-28 15:45:07 -0700 |
|---|---|---|
| committer | Tony Lindgren <tony@atomide.com> | 2009-05-28 15:45:07 -0700 |
| commit | 4c50d22a0cf240918d53afbf9a8416a9d93aacee (patch) | |
| tree | 5b76b4c167cdc80a6911fc70b168c2a2025814db /arch/arm/mach-omap2/Makefile | |
| parent | 970a724d9173526512ebd8be991a4cbe18b7aace (diff) | |
| parent | 7419045016e5002b3ccee72b28e41bf53dca68f2 (diff) | |
| download | blackbird-op-linux-4c50d22a0cf240918d53afbf9a8416a9d93aacee.tar.gz blackbird-op-linux-4c50d22a0cf240918d53afbf9a8416a9d93aacee.zip | |
Merge branch 'omap3-boards' into for-next
Diffstat (limited to 'arch/arm/mach-omap2/Makefile')
| -rw-r--r-- | arch/arm/mach-omap2/Makefile | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/arch/arm/mach-omap2/Makefile b/arch/arm/mach-omap2/Makefile index 516477ee5690..c48b12c0fe2d 100644 --- a/arch/arm/mach-omap2/Makefile +++ b/arch/arm/mach-omap2/Makefile @@ -47,6 +47,8 @@ obj-$(CONFIG_MACH_OMAP_LDP) += board-ldp.o \ mmc-twl4030.o obj-$(CONFIG_MACH_OVERO) += board-overo.o \ mmc-twl4030.o +obj-$(CONFIG_MACH_OMAP3EVM) += board-omap3evm.o \ + mmc-twl4030.o obj-$(CONFIG_MACH_OMAP3_PANDORA) += board-omap3pandora.o \ mmc-twl4030.o obj-$(CONFIG_MACH_OMAP_3430SDP) += board-3430sdp.o \ @@ -55,7 +57,9 @@ obj-$(CONFIG_MACH_OMAP_3430SDP) += board-3430sdp.o \ 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 obj-y += usb-musb.o |
