Patchwork [resend] mtd/maps: Fix accidental removal in Makefile

login
register
mail settings
Submitter Atsushi Nemoto
Date Nov. 7, 2009, 5:43 p.m.
Message ID <20091108.024307.183026733.anemo@mba.ocn.ne.jp>
Download mbox | patch
Permalink /patch/37917/
State New
Headers show

Comments

Atsushi Nemoto - Nov. 7, 2009, 5:43 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>
---
This patch fixes a regression from 2.6.31

 drivers/mtd/maps/Makefile |    2 ++
 1 files changed, 2 insertions(+), 0 deletions(-)
Artem Bityutskiy - Nov. 9, 2009, 11:40 a.m.
On Sun, 2009-11-08 at 02:43 +0900, 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.
> 
> Signed-off-by: Atsushi Nemoto <anemo@mba.ocn.ne.jp>
> ---
> This patch fixes a regression from 2.6.31
> 
>  drivers/mtd/maps/Makefile |    2 ++
>  1 files changed, 2 insertions(+), 0 deletions(-)
> 
> 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

This patch is in my l2-mtd-2.6 tree now, but I think it should be merged
to 2.6.32-rcX.

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