mtd/include/linux config.h,1.6,1.7 jffs2_fs_sb.h,1.49,1.50

[Andrew Victor]

Update of /home/cvs/mtd/include/linux
In directory phoenix.infradead.org:/tmp/cvs-serv26481/include/linux

Modified Files:
	config.h jffs2_fs_sb.h 
Log Message:
This patch replaces the current CONFIG_JFFS2_FS_NAND, CONFIG_JFFS2_FS_NOR_ECC
and CONFIG_JFFS2_FS_DATAFLASH with a single configuration option - 
CONFIG_JFFS2_FS_WRITEBUFFER.

The only functional change of this patch is that the slower div/mod
calculations for SECTOR_ADDR(), PAGE_DIV() and PAGE_MOD() are now always
used when CONFIG_JFFS2_FS_WRITEBUFFER is enabled.


Signed-off-by: Andrew Victor <andrew at sanpeople.com>



Index: config.h
===================================================================
RCS file: /home/cvs/mtd/include/linux/config.h,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- config.h	10 Jul 2004 21:14:18 -0000	1.6
+++ config.h	9 Feb 2005 09:23:55 -0000	1.7
@@ -35,7 +35,7 @@
 #endif /* MTD_OUT_OF_TREE */
 
 #ifndef NONAND
-#define CONFIG_JFFS2_FS_NAND 1
+#define CONFIG_JFFS2_FS_WRITEBUFFER 1
 #endif
 
 #endif /* __MTD_CONFIG_H__ */

Index: jffs2_fs_sb.h
===================================================================
RCS file: /home/cvs/mtd/include/linux/jffs2_fs_sb.h,v
retrieving revision 1.49
retrieving revision 1.50
diff -u -r1.49 -r1.50
--- jffs2_fs_sb.h	9 Feb 2005 09:17:41 -0000	1.49
+++ jffs2_fs_sb.h	9 Feb 2005 09:23:55 -0000	1.50
@@ -94,7 +94,7 @@
 	   to an obsoleted node. I don't like this. Alternatives welcomed. */
 	struct semaphore erase_free_sem;
 
-#if defined CONFIG_JFFS2_FS_NAND || defined CONFIG_JFFS2_FS_NOR_ECC || defined CONFIG_JFFS2_FS_DATAFLASH
+#ifdef CONFIG_JFFS2_FS_WRITEBUFFER
 	/* Write-behind buffer for NAND flash */
 	unsigned char *wbuf;
 	uint32_t wbuf_ofs;