mtd/fs/jffs2 os-linux.h,1.48,1.49 wbuf.c,1.73,1.74

[havasi at infradead.org]

Update of /home/cvs/mtd/fs/jffs2
In directory phoenix.infradead.org:/home/havasi/mtd/fs/jffs2

Modified Files:
	os-linux.h wbuf.c 
Log Message:
Make it compilable without JFFS2_FS_NOR_ECC, too



Index: os-linux.h
===================================================================
RCS file: /home/cvs/mtd/fs/jffs2/os-linux.h,v
retrieving revision 1.48
retrieving revision 1.49
diff -u -r1.48 -r1.49
--- os-linux.h	3 Nov 2004 12:57:39 -0000	1.48
+++ os-linux.h	4 Nov 2004 21:42:14 -0000	1.49
@@ -145,8 +145,8 @@
 void jffs2_nor_ecc_flash_cleanup(struct jffs2_sb_info *c);
 #else
 #define jffs2_nor_ecc(c) (0)
-#define jffs2_nor_ecc_flash_setup (0)
-#define jffs2_nor_ecc_flash_cleanup do {} while (0)
+#define jffs2_nor_ecc_flash_setup(c) (0)
+#define jffs2_nor_ecc_flash_cleanup(c)
 #endif /* NOR ECC */
 #endif /* NAND */
 

Index: wbuf.c
===================================================================
RCS file: /home/cvs/mtd/fs/jffs2/wbuf.c,v
retrieving revision 1.73
retrieving revision 1.74
diff -u -r1.73 -r1.74
--- wbuf.c	3 Nov 2004 12:57:39 -0000	1.73
+++ wbuf.c	4 Nov 2004 21:42:14 -0000	1.74
@@ -1135,6 +1135,8 @@
 	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;
@@ -1153,3 +1155,5 @@
 void jffs2_nor_ecc_flash_cleanup(struct jffs2_sb_info *c) {
 	kfree(c->wbuf);
 }
+
+#endif