oops.. forgot to mention this is for the sunxi-3.4 branch. But I think the newer ones don't have any sunxi-nand content yet.
On Fri, Jul 25, 2014 at 9:14 AM, Tim Tisdall <tisd...@gmail.com> wrote: > From cdc41a44c4fad7626b6e65939e009acf80fd154a Mon Sep 17 00:00:00 2001 > From: Tim Tisdall <tisd...@gmail.com> > Date: Wed, 23 Jul 2014 10:35:24 -0400 > Subject: [PATCH] rename to sunxi_nand to avoid naming conflict > > rename to sunxi_nand to avoid conflict with drivers/mtd/nand/nand.ko > --- > drivers/block/sunxi_nand/nfd/Makefile | 16 +++++++++------- > 1 file changed, 9 insertions(+), 7 deletions(-) > > diff --git a/drivers/block/sunxi_nand/nfd/Makefile > b/drivers/block/sunxi_nand/nfd/Makefile > index 32507e6..bd91457 100644 > --- a/drivers/block/sunxi_nand/nfd/Makefile > +++ b/drivers/block/sunxi_nand/nfd/Makefile > @@ -1,10 +1,12 @@ > > -obj-$(CONFIG_SUNXI_NAND) += nand.o > -nand-y := nand_blk.o dma_for_nand.o int_for_nand.o \ > - ../src/format/nand_format.o \ > - ../src/logic/bad_manage.o ../src/logic/logic_ctl.o > ../src/logic/mapping.o ../src/logic/mapping_base.o ../src/logic/merge.o > ../src/logic/read_reclaim.o ../src/logic/wear_levelling.o > ../src/logic/logic_cache.o \ > - ../src/scan/nand_scan.o ../src/scan/nand_id.o\ > - ../src/physic/nand_phy.o ../src/physic/nand_simple_r.o > ../src/physic/nand_simple_w.o \ > - ../nfc/nfc_r.o ../nfc/nfc_w.o > +obj-$(CONFIG_SUNXI_NAND) += sunxi_nand.o > +sunxi_nand-y := nand_blk.o dma_for_nand.o int_for_nand.o \ > + ../src/format/nand_format.o \ > + ../src/logic/bad_manage.o ../src/logic/logic_ctl.o > ../src/logic/mapping.o \ > + ../src/logic/mapping_base.o ../src/logic/merge.o > ../src/logic/read_reclaim.o \ > + ../src/logic/wear_levelling.o ../src/logic/logic_cache.o \ > + ../src/scan/nand_scan.o ../src/scan/nand_id.o \ > + ../src/physic/nand_phy.o ../src/physic/nand_simple_r.o > ../src/physic/nand_simple_w.o \ > + ../nfc/nfc_r.o ../nfc/nfc_w.o > > > -- > 1.9.1 > > > -- You received this message because you are subscribed to the Google Groups "linux-sunxi" group. To unsubscribe from this group and stop receiving emails from it, send an email to linux-sunxi+unsubscr...@googlegroups.com. For more options, visit https://groups.google.com/d/optout.
