diff options
| author | Tony Lindgren <tony@atomide.com> | 2009-05-28 18:45:14 -0400 |
|---|---|---|
| committer | Tony Lindgren <tony@atomide.com> | 2009-05-28 18:45:14 -0400 |
| commit | cd07ecc828486e5887113c7dc4d9f9022145811b (patch) | |
| tree | f3950d6077a794d4500244b2f372c6912af15eec /arch/arm/mach-omap2/Makefile | |
| parent | 4c50d22a0cf240918d53afbf9a8416a9d93aacee (diff) | |
| parent | b04e8975e70d9b2bc27c017f92b356b312692544 (diff) | |
Merge branch 'omap4' into for-next
Diffstat (limited to 'arch/arm/mach-omap2/Makefile')
| -rw-r--r-- | arch/arm/mach-omap2/Makefile | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/arch/arm/mach-omap2/Makefile b/arch/arm/mach-omap2/Makefile index c48b12c0fe2..3a48f2fb0ca 100644 --- a/arch/arm/mach-omap2/Makefile +++ b/arch/arm/mach-omap2/Makefile | |||
| @@ -60,6 +60,9 @@ obj-$(CONFIG_MACH_NOKIA_RX51) += board-rx51.o \ | |||
| 60 | obj-$(CONFIG_MACH_OMAP_ZOOM2) += board-zoom2.o \ | 60 | obj-$(CONFIG_MACH_OMAP_ZOOM2) += board-zoom2.o \ |
| 61 | mmc-twl4030.o \ | 61 | mmc-twl4030.o \ |
| 62 | board-zoom-debugboard.o | 62 | board-zoom-debugboard.o |
| 63 | |||
| 64 | obj-$(CONFIG_MACH_OMAP_4430SDP) += board-4430sdp.o | ||
| 65 | |||
| 63 | # Platform specific device init code | 66 | # Platform specific device init code |
| 64 | obj-y += usb-musb.o | 67 | obj-y += usb-musb.o |
| 65 | 68 | ||