mtd/include/linux/mtd compatmac.h,1.39,1.40

[David Woodhouse]

Update of /home/cvs/mtd/include/linux/mtd
In directory phoenix.infradead.org:/tmp/cvs-serv13174

Modified Files:
	compatmac.h 
Log Message:
handle newer 2.4.x and 2.4.x-rh kernels

Index: compatmac.h
===================================================================
RCS file: /home/cvs/mtd/include/linux/mtd/compatmac.h,v
retrieving revision 1.39
retrieving revision 1.40
diff -u -r1.39 -r1.40
--- compatmac.h	7 Aug 2002 11:10:34 -0000	1.39
+++ compatmac.h	4 Sep 2002 22:14:32 -0000	1.40
@@ -489,6 +489,7 @@
 {
 	recalc_sigpending(current);
 }
+#undef recalc_sigpending
 #define recalc_sigpending() __recalc_sigpending ()
 #endif
 
@@ -505,10 +506,14 @@
 #ifndef yield
 #define yield() do { set_current_state(TASK_RUNNING); schedule(); } while(0)
 #endif
+#ifndef minor
 #define major(d) (MAJOR(to_kdev_t(d)))
 #define minor(d) (MINOR(to_kdev_t(d)))
+#endif
+#ifndef mk_kdev
 #define mk_kdev(ma,mi) MKDEV(ma,mi)
 #define kdev_t_to_nr(x)	(x)
+#endif
 #endif
 
 #if LINUX_VERSION_CODE < KERNEL_VERSION(2,4,0)