mtd/fs/jffs2 os-linux.h,1.49,1.50 wbuf.c,1.74,1.75

[jwboyer at infradead.org]

Update of /home/cvs/mtd/fs/jffs2
In directory phoenix.infradead.org:/tmp/cvs-serv6366

Modified Files:
	os-linux.h wbuf.c 
Log Message:
Fixup the fix from Ferenc.  Stupid me


Index: os-linux.h
===================================================================
RCS file: /home/cvs/mtd/fs/jffs2/os-linux.h,v
retrieving revision 1.49
retrieving revision 1.50
diff -u -r1.49 -r1.50
--- os-linux.h	4 Nov 2004 21:42:14 -0000	1.49
+++ os-linux.h	4 Nov 2004 22:10:28 -0000	1.50
@@ -115,6 +115,9 @@
 #define jffs2_flash_writev(a,b,c,d,e,f) jffs2_flash_direct_writev(a,b,c,d,e)
 #define jffs2_wbuf_timeout NULL
 #define jffs2_wbuf_process NULL
+#define jffs2_nor_ecc(c) (0)
+#define jffs2_nor_ecc_flash_setup(c) (0)
+#define jffs2_nor_ecc_flash_cleanup(c) do {} while (0)
 
 #else /* NAND and/or ECC'd NOR support present */
 
@@ -146,7 +149,7 @@
 #else
 #define jffs2_nor_ecc(c) (0)
 #define jffs2_nor_ecc_flash_setup(c) (0)
-#define jffs2_nor_ecc_flash_cleanup(c)
+#define jffs2_nor_ecc_flash_cleanup(c) do {} while (0)
 #endif /* NOR ECC */
 #endif /* NAND */
 

Index: wbuf.c
===================================================================
RCS file: /home/cvs/mtd/fs/jffs2/wbuf.c,v
retrieving revision 1.74
retrieving revision 1.75
diff -u -r1.74 -r1.75
--- wbuf.c	4 Nov 2004 21:42:14 -0000	1.74
+++ wbuf.c	4 Nov 2004 22:10:28 -0000	1.75
@@ -1135,8 +1135,6 @@
 	kfree(c->wbuf);
 }
 
-#ifdef CONFIG_JFFS2_FS_NOR_ECC
-
 int jffs2_nor_ecc_flash_setup(struct jffs2_sb_info *c) {
 	/* Cleanmarker is actually larger on the flashes */
 	c->cleanmarker_size = 16;
@@ -1155,5 +1153,3 @@
 void jffs2_nor_ecc_flash_cleanup(struct jffs2_sb_info *c) {
 	kfree(c->wbuf);
 }
-
-#endif