mtd/fs/jffs inode-v23.c,1.73,1.74 jffs_fm.c,1.29,1.30

[acurtis at onz.com]

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

Modified Files:
	inode-v23.c jffs_fm.c 
Log Message:
Updated conditional compile for minor/major macros.


Index: inode-v23.c
===================================================================
RCS file: /home/cvs/mtd/fs/jffs/inode-v23.c,v
retrieving revision 1.73
retrieving revision 1.74
diff -u -r1.73 -r1.74
--- inode-v23.c	13 Mar 2003 10:04:52 -0000	1.73
+++ inode-v23.c	2 Jul 2003 20:36:26 -0000	1.74
@@ -59,7 +59,7 @@
 #include "jffs_proc.h"
 #endif
 
-#if LINUX_VERSION_CODE < KERNEL_VERSION(2,5,2)
+#if (LINUX_VERSION_CODE < KERNEL_VERSION(2,5,2)) && !defined(minor)
 #define minor(x) MINOR(x)
 #define major(x) MAJOR(x)
 #endif

Index: jffs_fm.c
===================================================================
RCS file: /home/cvs/mtd/fs/jffs/jffs_fm.c,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -r1.29 -r1.30
--- jffs_fm.c	22 Jan 2002 09:48:16 -0000	1.29
+++ jffs_fm.c	2 Jul 2003 20:36:26 -0000	1.30
@@ -23,7 +23,7 @@
 #include <linux/compatmac.h>
 #include "jffs_fm.h"
 
-#if LINUX_VERSION_CODE < KERNEL_VERSION(2,5,2)
+#if (LINUX_VERSION_CODE < KERNEL_VERSION(2,5,2))) && !defined(minor)
 #define minor(x) MINOR(x)
 #define major(x) MAJOR(x)
 #endif