mtd/drivers/mtd/nand autcpu12.c,1.19,1.20 tx4925ndfmc.c,1.2,1.3

David Woodhouse dwmw2 at infradead.org
Mon Jul 19 22:44:29 EDT 2004


Update of /home/cvs/mtd/drivers/mtd/nand
In directory phoenix.infradead.org:/tmp/cvs-serv15736/drivers/mtd/nand

Modified Files:
	autcpu12.c tx4925ndfmc.c 
Log Message:
The patch below (applies against 2.6.8-rc2) removes some #ifdef's for 
kernel 2.0 and 2.2 from the MTD code.

diffstat output:
 drivers/mtd/chips/cfi_cmdset_0020.c |    5 -----
 drivers/mtd/nand/tx4925ndfmc.c      |    8 --------
 drivers/mtd/devices/pmc551.c        |   12 +++---------
 drivers/mtd/nand/autcpu12.c         |    8 --------
 include/linux/mtd/cfi.h             |    2 --
 5 files changed, 3 insertions(+), 32 deletions(-)


Signed-off-by: Adrian Bunk <bunk at fs.tum.de>


Index: autcpu12.c
===================================================================
RCS file: /home/cvs/mtd/drivers/mtd/nand/autcpu12.c,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- autcpu12.c	12 Jul 2004 15:02:15 -0000	1.19
+++ autcpu12.c	20 Jul 2004 02:44:26 -0000	1.20
@@ -44,14 +44,6 @@
  */
 static struct mtd_info *autcpu12_mtd = NULL;
 
-/*
- * Module stuff
- */
-#if LINUX_VERSION_CODE < 0x20212 && defined(MODULE)
-#define autcpu12_init init_module
-#define autcpu12_cleanup cleanup_module
-#endif
-
 static int autcpu12_io_base = CS89712_VIRT_BASE;
 static int autcpu12_fio_pbase = AUTCPU12_PHYS_SMC;
 static int autcpu12_fio_ctrl = AUTCPU12_SMC_SELECT_OFFSET;

Index: tx4925ndfmc.c
===================================================================
RCS file: /home/cvs/mtd/drivers/mtd/nand/tx4925ndfmc.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- tx4925ndfmc.c	27 Mar 2004 19:55:53 -0000	1.2
+++ tx4925ndfmc.c	20 Jul 2004 02:44:26 -0000	1.3
@@ -40,14 +40,6 @@
 static struct mtd_info *tx4925ndfmc_mtd = NULL;
 
 /*
- * Module stuff
- */
-#if LINUX_VERSION_CODE < 0x20212 && defined(MODULE)
-#define tx4925ndfmc_init init_module
-#define tx4925ndfmc_cleanup cleanup_module
-#endif
-
-/*
  * Define partitions for flash devices
  */
 





More information about the linux-mtd-cvs mailing list