mtd/fs/jffs2 compr.c,1.25,1.26 compr_zlib.c,1.21,1.22 nodelist.c,1.70,1.71 nodelist.h,1.88,1.89

[David Woodhouse]

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

Modified Files:
	compr.c compr_zlib.c nodelist.c nodelist.h 
Log Message:
include cleanups to prevent jffs2.h from needing linux/types.h

Index: compr.c
===================================================================
RCS file: /home/cvs/mtd/fs/jffs2/compr.c,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -r1.25 -r1.26
--- compr.c	9 Jan 2003 14:03:37 -0000	1.25
+++ compr.c	12 Jan 2003 13:21:28 -0000	1.26
@@ -15,6 +15,7 @@
 #include <linux/kernel.h>
 #include <linux/string.h>
 #include <linux/errno.h>
+#include <linux/types.h>
 #else 
 #define KERN_DEBUG
 #define KERN_NOTICE

Index: compr_zlib.c
===================================================================
RCS file: /home/cvs/mtd/fs/jffs2/compr_zlib.c,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- compr_zlib.c	10 Jan 2003 11:42:35 -0000	1.21
+++ compr_zlib.c	12 Jan 2003 13:21:28 -0000	1.22
@@ -19,7 +19,6 @@
 #include <linux/kernel.h>
 #include <linux/mtd/compatmac.h> /* for min() */
 #include <linux/slab.h>
-#include <linux/jffs2.h>
 #include <linux/zlib.h>
 #include <linux/zutil.h>
 #include <asm/semaphore.h>

Index: nodelist.c
===================================================================
RCS file: /home/cvs/mtd/fs/jffs2/nodelist.c,v
retrieving revision 1.70
retrieving revision 1.71
diff -u -r1.70 -r1.71
--- nodelist.c	10 Jan 2003 17:17:34 -0000	1.70
+++ nodelist.c	12 Jan 2003 13:21:28 -0000	1.71
@@ -251,8 +251,8 @@
 				}
 
 				if (node.i.compr != JFFS2_COMPR_ZERO && je32_to_cpu(node.i.csize)) {
-					u_char *buf=NULL;
-					u32 pointed = 0;
+					unsigned char *buf=NULL;
+					uint32_t pointed = 0;
 #ifndef __ECOS
 					if (c->mtd->point) {
 						err = c->mtd->point (c->mtd, ref_offset(ref) + sizeof(node.i), je32_to_cpu(node.i.csize),

Index: nodelist.h
===================================================================
RCS file: /home/cvs/mtd/fs/jffs2/nodelist.h,v
retrieving revision 1.88
retrieving revision 1.89
diff -u -r1.88 -r1.89
--- nodelist.h	9 Jan 2003 13:56:27 -0000	1.88
+++ nodelist.h	12 Jan 2003 13:21:28 -0000	1.89
@@ -16,10 +16,11 @@
 
 #include <linux/config.h>
 #include <linux/fs.h>
-
+#include <linux/types.h>
 #include <linux/jffs2.h>
 #include <linux/jffs2_fs_sb.h>
 #include <linux/jffs2_fs_i.h>
+
 #ifdef __ECOS
 #include "os-ecos.h"
 #else