bk://linux-mtd.bkbits.net/mtd-2.6
domen@coderock.org|ChangeSet|20040723154813|16554 domen
# This is a BitKeeper generated diff -Nru style patch.
#
# ChangeSet
# 2004/08/04 02:53:11-07:00 akpm@bix.(none)
# Merge bix.(none):/usr/src/bk25 into bix.(none):/usr/src/bk-mtd
#
# fs/Kconfig
# 2004/08/04 02:53:07-07:00 akpm@bix.(none) +0 -0
# Auto merged
#
# ChangeSet
# 2004/08/02 13:25:52-07:00 akpm@bix.(none)
# Merge bix.(none):/usr/src/bk25 into bix.(none):/usr/src/bk-mtd
#
# MAINTAINERS
# 2004/08/02 13:25:49-07:00 akpm@bix.(none) +0 -0
# Auto merged
#
# ChangeSet
# 2004/08/02 01:16:16-07:00 akpm@bix.(none)
# Merge bk://linux-mtd.bkbits.net/mtd-2.6 into bix.(none):/usr/src/bk-mtd
#
# fs/Kconfig
# 2004/08/02 01:16:13-07:00 akpm@bix.(none) +0 -0
# Auto merged
#
# MAINTAINERS
# 2004/08/02 01:16:12-07:00 akpm@bix.(none) +0 -0
# Auto merged
#
# ChangeSet
# 2004/07/23 11:48:13-04:00 domen@coderock.org
# remove unused #include <linux/version.h>
#
# From: Domen Puncer <domen@coderock.org>
# Signed-off-by: Maximilian Attems <janitor@sternwelten.at>
# Signed-off-by: David Woodhouse <dwmw2@infradead.org>
#
# drivers/mtd/mtdcore.c
# 2004/07/23 11:47:53-04:00 domen@coderock.org +1 -2
# remove unused #include <linux/version.h>
#
# From: Domen Puncer <domen@coderock.org>
# Signed-off-by: Maximilian Attems <janitor@sternwelten.at>
# Signed-off-by: David Woodhouse <dwmw2@infradead.org>
#
# ChangeSet
# 2004/07/23 11:19:41-04:00 dwmw2@shinybook.infradead.org
# Merge shinybook.infradead.org:/home/dwmw2/bk/linus-2.5
# into shinybook.infradead.org:/home/dwmw2/bk/mtd-2.6
#
# MAINTAINERS
# 2004/07/23 11:19:33-04:00 dwmw2@shinybook.infradead.org +0 -0
# Auto merged
#
# ChangeSet
# 2004/07/20 12:42:36-04:00 dwmw2@shinybook.infradead.org
# NAND support in JFFS2 isn't experimental any more.
#
# fs/Kconfig
# 2004/07/20 12:42:16-04:00 dwmw2@shinybook.infradead.org +7 -12
# NAND support in JFFS2 isn't experimental.
#
# ChangeSet
# 2004/07/20 12:40:06-04:00 kronos@kronoz.cjb.net
# Fix JFFS2_COMPRESSION_OPTIONS in Kconfig
#
# Hi,
# It seems to me that JFFS2_COMPRESSION_OPTIONS depends on JFFS2_FS:
#
# Signed-off-by: David Woodhouse <dwmw2@infradead.org>
#
# fs/Kconfig
# 2004/07/20 12:39:47-04:00 kronos@kronoz.cjb.net +1 -0
# Hi,
# It seems to me that JFFS2_COMPRESSION_OPTIONS depends on JFFS2_FS:
#
# ChangeSet
# 2004/07/20 12:37:20-04:00 bunk@fs.tum.de
# MAINTAINERS: update MTD list
#
# Trying to send an email to mtd@infradead.org gives you the answer that
# you should use linux-mtd@lists.infradead.org instead.
#
# So let's update the entry in MAINTAINERS.
#
# Signed-off-by: Adrian Bunk <bunk@fs.tum.de>
# Signed-off-by: David Woodhouse <dwmw2@infradead.org>
#
# MAINTAINERS
# 2004/07/20 12:36:59-04:00 bunk@fs.tum.de +1 -1
#
# Trying to send an email to mtd@infradead.org gives you the answer that
# you should use linux-mtd@lists.infradead.org instead.
#
# So let's update the entry in MAINTAINERS.
#
# ChangeSet
# 2004/07/20 12:35:52-04:00 bunk@fs.tum.de
# MTD: remove some kernel 2.0 and 2.2 #ifdef's
#
# The patch below (applies against 2.6.8-rc2) removes some #ifdef's for
# kernel 2.0 and 2.2 from the MTD code.
#
# Signed-off-by: Adrian Bunk <bunk@fs.tum.de>
# Signed-off-by: David Woodhouse <dwmw2@infradead.org>
#
# include/linux/mtd/cfi.h
# 2004/07/20 12:35:32-04:00 bunk@fs.tum.de +1 -3
# The patch below (applies against 2.6.8-rc2) removes some #ifdef's for
# kernel 2.0 and 2.2 from the MTD code.
#
# drivers/mtd/nand/tx4925ndfmc.c
# 2004/07/20 12:35:32-04:00 bunk@fs.tum.de +1 -9
# The patch below (applies against 2.6.8-rc2) removes some #ifdef's for
# kernel 2.0 and 2.2 from the MTD code.
#
# drivers/mtd/nand/autcpu12.c
# 2004/07/20 12:35:32-04:00 bunk@fs.tum.de +1 -9
# The patch below (applies against 2.6.8-rc2) removes some #ifdef's for
# kernel 2.0 and 2.2 from the MTD code.
#
# drivers/mtd/devices/pmc551.c
# 2004/07/20 12:35:32-04:00 bunk@fs.tum.de +4 -10
# The patch below (applies against 2.6.8-rc2) removes some #ifdef's for
# kernel 2.0 and 2.2 from the MTD code.
#
# drivers/mtd/chips/cfi_cmdset_0020.c
# 2004/07/20 12:35:32-04:00 bunk@fs.tum.de +1 -6
# The patch below (applies against 2.6.8-rc2) removes some #ifdef's for
# kernel 2.0 and 2.2 from the MTD code.
#
diff -Nru a/MAINTAINERS b/MAINTAINERS
--- a/MAINTAINERS 2004-08-04 17:54:01 -07:00
+++ b/MAINTAINERS 2004-08-04 17:54:01 -07:00
@@ -1384,7 +1384,7 @@
P: David Woodhouse
M: dwmw2@redhat.com
W: http://www.linux-mtd.infradead.org/
-L: mtd@infradead.org
+L: linux-mtd@lists.infradead.org
S: Maintained
MICROTEK X6 SCANNER
diff -Nru a/drivers/mtd/chips/cfi_cmdset_0020.c b/drivers/mtd/chips/cfi_cmdset_0020.c
--- a/drivers/mtd/chips/cfi_cmdset_0020.c 2004-08-04 17:54:01 -07:00
+++ b/drivers/mtd/chips/cfi_cmdset_0020.c 2004-08-04 17:54:01 -07:00
@@ -4,7 +4,7 @@
*
* (C) 2000 Red Hat. GPL'd
*
- * $Id: cfi_cmdset_0020.c,v 1.13 2004/07/12 21:52:50 dwmw2 Exp $
+ * $Id: cfi_cmdset_0020.c,v 1.14 2004/07/20 02:44:25 dwmw2 Exp $
*
* 10/10/2000 Nicolas Pitre <nico@cam.org>
* - completely revamped method functions so they are aware and
@@ -1399,11 +1399,6 @@
kfree(cfi->cmdset_priv);
kfree(cfi);
}
-
-#if LINUX_VERSION_CODE < 0x20212 && defined(MODULE)
-#define cfi_staa_init init_module
-#define cfi_staa_exit cleanup_module
-#endif
static char im_name[]="cfi_cmdset_0020";
diff -Nru a/drivers/mtd/devices/pmc551.c b/drivers/mtd/devices/pmc551.c
--- a/drivers/mtd/devices/pmc551.c 2004-08-04 17:54:01 -07:00
+++ b/drivers/mtd/devices/pmc551.c 2004-08-04 17:54:01 -07:00
@@ -1,5 +1,5 @@
/*
- * $Id: pmc551.c,v 1.26 2004/07/14 17:25:07 dwmw2 Exp $
+ * $Id: pmc551.c,v 1.27 2004/07/20 02:44:26 dwmw2 Exp $
*
* PMC551 PCI Mezzanine Ram Device
*
@@ -109,12 +109,6 @@
#include <linux/mtd/pmc551.h>
#include <linux/mtd/compatmac.h>
-#if LINUX_VERSION_CODE > 0x20300
-#define PCI_BASE_ADDRESS(dev) (dev->resource[0].start)
-#else
-#define PCI_BASE_ADDRESS(dev) (dev->base_address[0])
-#endif
-
static struct mtd_info *pmc551list;
static int pmc551_erase (struct mtd_info *mtd, struct erase_info *instr)
@@ -564,7 +558,7 @@
(size<1024)?size:(size<1048576)?size>>10:size>>20,
(size<1024)?'B':(size<1048576)?'K':'M',
size, ((dcmd&(0x1<<3)) == 0)?"non-":"",
- PCI_BASE_ADDRESS(dev)&PCI_BASE_ADDRESS_MEM_MASK );
+ (dev->resource[0].start)&PCI_BASE_ADDRESS_MEM_MASK );
/*
* Check to see the state of the memory
@@ -694,7 +688,7 @@
}
printk(KERN_NOTICE "pmc551: Found PCI V370PDC at 0x%lX\n",
- PCI_BASE_ADDRESS(PCI_Device));
+ PCI_Device->resource[0].start);
/*
* The PMC551 device acts VERY weird if you don't init it
@@ -748,7 +742,7 @@
printk(KERN_NOTICE "pmc551: Using specified aperture size %dM\n", asize>>20);
priv->asize = asize;
}
- priv->start = ioremap((PCI_BASE_ADDRESS(PCI_Device)
+ priv->start = ioremap(((PCI_Device->resource[0].start)
& PCI_BASE_ADDRESS_MEM_MASK),
priv->asize);
diff -Nru a/drivers/mtd/mtdcore.c b/drivers/mtd/mtdcore.c
--- a/drivers/mtd/mtdcore.c 2004-08-04 17:54:01 -07:00
+++ b/drivers/mtd/mtdcore.c 2004-08-04 17:54:01 -07:00
@@ -1,12 +1,11 @@
/*
- * $Id: mtdcore.c,v 1.42 2004/07/13 10:21:13 dwmw2 Exp $
+ * $Id: mtdcore.c,v 1.43 2004/07/23 15:20:46 dwmw2 Exp $
*
* Core registration and callback routines for MTD
* drivers and users.
*
*/
-#include <linux/version.h>
#include <linux/config.h>
#include <linux/module.h>
#include <linux/kernel.h>
diff -Nru a/drivers/mtd/nand/autcpu12.c b/drivers/mtd/nand/autcpu12.c
--- a/drivers/mtd/nand/autcpu12.c 2004-08-04 17:54:01 -07:00
+++ b/drivers/mtd/nand/autcpu12.c 2004-08-04 17:54:01 -07:00
@@ -6,7 +6,7 @@
* Derived from drivers/mtd/spia.c
* Copyright (C) 2000 Steven J. Hill (sjhill@realitydiluted.com)
*
- * $Id: autcpu12.c,v 1.19 2004/07/12 15:02:15 dwmw2 Exp $
+ * $Id: autcpu12.c,v 1.20 2004/07/20 02:44:26 dwmw2 Exp $
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License version 2 as
@@ -43,14 +43,6 @@
* MTD structure for AUTCPU12 board
*/
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;
diff -Nru a/drivers/mtd/nand/tx4925ndfmc.c b/drivers/mtd/nand/tx4925ndfmc.c
--- a/drivers/mtd/nand/tx4925ndfmc.c 2004-08-04 17:54:01 -07:00
+++ b/drivers/mtd/nand/tx4925ndfmc.c 2004-08-04 17:54:01 -07:00
@@ -11,7 +11,7 @@
* Derived from drivers/mtd/autcpu12.c
* Copyright (c) 2001 Thomas Gleixner (gleixner@autronix.de)
*
- * $Id: tx4925ndfmc.c,v 1.2 2004/03/27 19:55:53 gleixner Exp $
+ * $Id: tx4925ndfmc.c,v 1.3 2004/07/20 02:44:26 dwmw2 Exp $
*
* Copyright (C) 2001 Toshiba Corporation
*
@@ -38,14 +38,6 @@
* MTD structure for RBTX4925 board
*/
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
diff -Nru a/fs/Kconfig b/fs/Kconfig
--- a/fs/Kconfig 2004-08-04 17:54:01 -07:00
+++ b/fs/Kconfig 2004-08-04 17:54:01 -07:00
@@ -1076,24 +1076,20 @@
messages at debug level 1 while the misbehaviour was occurring.
config JFFS2_FS_NAND
- bool "JFFS2 support for NAND flash (EXPERIMENTAL)"
- depends on JFFS2_FS && EXPERIMENTAL
+ bool "JFFS2 support for NAND flash"
+ depends on JFFS2_FS
default n
help
- This enables the experimental support for NAND flash in JFFS2. NAND
- is a newer type of flash chip design than the traditional NOR flash,
- with higher density but a handful of characteristics which make it
- more interesting for the file system to use. Support for NAND flash
- is not yet complete and may corrupt data. For further information,
- including a link to the mailing list where details of the remaining
- work to be completed for NAND flash support can be found, see the
- JFFS2 web site at <http://sources.redhat.com/jffs2>.
+ This enables the support for NAND flash in JFFS2. NAND is a newer
+ type of flash chip design than the traditional NOR flash, with
+ higher density but a handful of characteristics which make it more
+ interesting for the file system to use.
- Say 'N' unless you have NAND flash and you are willing to test and
- develop JFFS2 support for it.
+ Say 'N' unless you have NAND flash.
config JFFS2_COMPRESSION_OPTIONS
bool "Advanced compression options for JFFS2"
+ depends on JFFS2_FS
default n
help
Enabling this option allows you to explicitly choose which
diff -Nru a/include/linux/mtd/cfi.h b/include/linux/mtd/cfi.h
--- a/include/linux/mtd/cfi.h 2004-08-04 17:54:01 -07:00
+++ b/include/linux/mtd/cfi.h 2004-08-04 17:54:01 -07:00
@@ -1,7 +1,7 @@
/* Common Flash Interface structures
* See http://support.intel.com/design/flash/technote/index.htm
- * $Id: cfi.h,v 1.44 2004/07/13 22:32:52 dwmw2 Exp $
+ * $Id: cfi.h,v 1.45 2004/07/20 02:44:27 dwmw2 Exp $
*/
#ifndef __MTD_CFI_H__
@@ -328,14 +328,12 @@
static inline void cfi_udelay(int us)
{
-#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,2,0)
unsigned long t = us * HZ / 1000000;
if (t) {
set_current_state(TASK_UNINTERRUPTIBLE);
schedule_timeout(t);
return;
}
-#endif
udelay(us);
cond_resched();
}