diff options
| author | Felipe Balbi <balbi@ti.com> | 2010-11-08 06:56:14 +0000 |
|---|---|---|
| committer | Tony Lindgren <tony@atomide.com> | 2010-11-30 13:48:45 -0800 |
| commit | 20826853853aa1e1ba219ea65f1e6ba3bd662495 (patch) | |
| tree | b8bdd68ecea8a22b83619ac2a2e60a5533a10944 /arch/arm/mach-omap2/Makefile | |
| parent | 235228ba21e34ba732b413c12259bac386f83283 (diff) | |
| download | linux-stable-20826853853aa1e1ba219ea65f1e6ba3bd662495.tar.gz linux-stable-20826853853aa1e1ba219ea65f1e6ba3bd662495.tar.bz2 linux-stable-20826853853aa1e1ba219ea65f1e6ba3bd662495.zip | |
arm: omap: combine zoom2 and zoom3 board-files
They are extremely similar anyway, let's get rid
of one file.
While at that, also remove the empty zoom_config
variable.
Signed-off-by: Felipe Balbi <balbi@ti.com>
Signed-off-by: Tony Lindgren <tony@atomide.com>
Diffstat (limited to 'arch/arm/mach-omap2/Makefile')
| -rw-r--r-- | arch/arm/mach-omap2/Makefile | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/arm/mach-omap2/Makefile b/arch/arm/mach-omap2/Makefile index 60e51bcf53bd..b0810b9abbba 100644 --- a/arch/arm/mach-omap2/Makefile +++ b/arch/arm/mach-omap2/Makefile @@ -144,12 +144,12 @@ obj-$(CONFIG_MACH_NOKIA_RX51) += board-rx51.o \ board-rx51-peripherals.o \ board-rx51-video.o \ hsmmc.o -obj-$(CONFIG_MACH_OMAP_ZOOM2) += board-zoom2.o \ +obj-$(CONFIG_MACH_OMAP_ZOOM2) += board-zoom.o \ board-zoom-peripherals.o \ board-flash.o \ hsmmc.o \ board-zoom-debugboard.o -obj-$(CONFIG_MACH_OMAP_ZOOM3) += board-zoom3.o \ +obj-$(CONFIG_MACH_OMAP_ZOOM3) += board-zoom.o \ board-zoom-peripherals.o \ board-flash.o \ hsmmc.o \ |