Patchwork mtd/maps: Fix accidental removal in Makefile

login
register
mail settings
Submitter Atsushi Nemoto
Date Oct. 26, 2009, 12:51 p.m.
Message ID <1256561500-8036-1-git-send-email-anemo@mba.ocn.ne.jp>
Download mbox | patch
Permalink /patch/36904/
State Accepted
Commit 52cb0148ef2401dbffa4daf60588cad27e4f329d
Headers show

Comments

Atsushi Nemoto - Oct. 26, 2009, 12:51 p.m.
The commit d79c326 ("gpio-addr-flash: new driver for GPIO assisted
flash addressing") removed two lines from the Makefile by accident.
Though I'm not sure how this accident happened, this patch reverts the
removal.

Signed-off-by: Atsushi Nemoto <anemo@mba.ocn.ne.jp>
---
 drivers/mtd/maps/Makefile |    2 ++
 1 files changed, 2 insertions(+), 0 deletions(-)
Mike Frysinger - Oct. 26, 2009, 8:49 p.m.
On Mon, Oct 26, 2009 at 08:51, Atsushi Nemoto wrote:
> The commit d79c326 ("gpio-addr-flash: new driver for GPIO assisted
> flash addressing") removed two lines from the Makefile by accident.
> Though I'm not sure how this accident happened, this patch reverts the
> removal.

i know i got a conflict every time i cherry picked this forward, but i
guess i must have screwed up the merge in the version that was
actually merged.  sorry about that.
-mike

Patch

diff --git a/drivers/mtd/maps/Makefile b/drivers/mtd/maps/Makefile
index 1d5cf86..ae2f6db 100644
--- a/drivers/mtd/maps/Makefile
+++ b/drivers/mtd/maps/Makefile
@@ -58,4 +58,6 @@  obj-$(CONFIG_MTD_PLATRAM)	+= plat-ram.o
 obj-$(CONFIG_MTD_OMAP_NOR)	+= omap_nor.o
 obj-$(CONFIG_MTD_INTEL_VR_NOR)	+= intel_vr_nor.o
 obj-$(CONFIG_MTD_BFIN_ASYNC)	+= bfin-async-flash.o
+obj-$(CONFIG_MTD_RBTX4939)	+= rbtx4939-flash.o
+obj-$(CONFIG_MTD_VMU)		+= vmu-flash.o
 obj-$(CONFIG_MTD_GPIO_ADDR)	+= gpio-addr-flash.o