mtd/fs/jffs2/ecos/src os-ecos.h,1.20,1.21

[David Woodhouse]

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

Modified Files:
	os-ecos.h 
Log Message:
Merge changes from eCos tree:

revision 1.9
date: 2004/08/12 21:35:28;  author: asl;  state: Exp;  lines: +5 -3
        * Merge from public MTD.

Er yes, that's all he wrote :)


Index: os-ecos.h
===================================================================
RCS file: /home/cvs/mtd/fs/jffs2/ecos/src/os-ecos.h,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- os-ecos.h	5 May 2004 12:00:31 -0000	1.20
+++ os-ecos.h	11 Nov 2004 12:47:48 -0000	1.21
@@ -191,7 +191,7 @@
 #define jffs2_flush_wbuf_pad(c) ({ (void)(c), 0; })
 #define jffs2_flush_wbuf_gc(c, i) ({ (void)(c), (void) i, 0; })
 #define jffs2_nand_read_failcnt(c,jeb) do { ; } while(0)
-#define jffs2_write_nand_badblock(c,jeb) do { ; } while(0)
+#define jffs2_write_nand_badblock(c,jeb,p) (0)
 #define jffs2_flash_setup(c) (0)
 #define jffs2_nand_flash_cleanup(c) do {} while(0)
 #define jffs2_wbuf_dirty(c) (0)
@@ -206,4 +206,6 @@
 #define BUG_ON(x) do { if (unlikely(x)) BUG(); } while(0)
 #endif
 
+#define __init
+
 #endif /* __JFFS2_OS_ECOS_H__ */