diff options
| author | Paul Mundt <lethal@linux-sh.org> | 2011-01-10 22:01:14 -0500 |
|---|---|---|
| committer | Paul Mundt <lethal@linux-sh.org> | 2011-01-10 22:01:14 -0500 |
| commit | e9ab3207310e8acfa3a5cd8cbb44860f69270bfd (patch) | |
| tree | dce036fd737b4edb7e107e21e4af12fabec29bbd /arch/arm/mach-omap2/Makefile | |
| parent | e54be894eae10eca9892e965cc9532f5d5a11767 (diff) | |
| parent | 18faa1b68a54ff976dd03bfd9ace2c4ef4f7315c (diff) | |
Merge branch 'for-paul-38-rebased' of git://gitorious.org/linux-omap-dss2/linux
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 cd7332f50b2d..1c0c2b02d870 100644 --- a/arch/arm/mach-omap2/Makefile +++ b/arch/arm/mach-omap2/Makefile | |||
| @@ -187,16 +187,19 @@ obj-$(CONFIG_MACH_NOKIA_RX51) += board-rx51.o \ | |||
| 187 | hsmmc.o | 187 | hsmmc.o |
| 188 | obj-$(CONFIG_MACH_OMAP_ZOOM2) += board-zoom.o \ | 188 | obj-$(CONFIG_MACH_OMAP_ZOOM2) += board-zoom.o \ |
| 189 | board-zoom-peripherals.o \ | 189 | board-zoom-peripherals.o \ |
| 190 | board-zoom-display.o \ | ||
| 190 | board-flash.o \ | 191 | board-flash.o \ |
| 191 | hsmmc.o \ | 192 | hsmmc.o \ |
| 192 | board-zoom-debugboard.o | 193 | board-zoom-debugboard.o |
| 193 | obj-$(CONFIG_MACH_OMAP_ZOOM3) += board-zoom.o \ | 194 | obj-$(CONFIG_MACH_OMAP_ZOOM3) += board-zoom.o \ |
| 194 | board-zoom-peripherals.o \ | 195 | board-zoom-peripherals.o \ |
| 196 | board-zoom-display.o \ | ||
| 195 | board-flash.o \ | 197 | board-flash.o \ |
| 196 | hsmmc.o \ | 198 | hsmmc.o \ |
| 197 | board-zoom-debugboard.o | 199 | board-zoom-debugboard.o |
| 198 | obj-$(CONFIG_MACH_OMAP_3630SDP) += board-3630sdp.o \ | 200 | obj-$(CONFIG_MACH_OMAP_3630SDP) += board-3630sdp.o \ |
| 199 | board-zoom-peripherals.o \ | 201 | board-zoom-peripherals.o \ |
| 202 | board-zoom-display.o \ | ||
| 200 | board-flash.o \ | 203 | board-flash.o \ |
| 201 | hsmmc.o | 204 | hsmmc.o |
| 202 | obj-$(CONFIG_MACH_CM_T35) += board-cm-t35.o \ | 205 | obj-$(CONFIG_MACH_CM_T35) += board-cm-t35.o \ |