mtd/include/linux/mtd compatmac.h,1.62,1.63

Thayne Harbaugh tharbaugh at lnxi.com
Fri Nov 14 14:50:07 EST 2003


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

Modified Files:
	compatmac.h 
Log Message:

* add "#include <linux/mtd/compatmac.h>" to mtdchar.c for iminor()

* fix iminor(), imajor() and old_encode_dev() in compatmac.h

* add EXPORT_LICENSE("GPL") to map_funcs.c and cfi_util.c


Index: compatmac.h
===================================================================
RCS file: /home/cvs/mtd/include/linux/mtd/compatmac.h,v
retrieving revision 1.62
retrieving revision 1.63
diff -u -r1.62 -r1.63
--- compatmac.h	3 Nov 2003 12:20:23 -0000	1.62
+++ compatmac.h	14 Nov 2003 19:50:04 -0000	1.63
@@ -53,9 +53,9 @@
 
 #endif /* < 2.4.20 */
 #if LINUX_VERSION_CODE < KERNEL_VERSION(2,5,73)
-#define iminor(d) minor(d)
-#define imajor(d) major(d)
-#define old_encode_dev(d) ( (imajor(d)<<8) | iminor(d) )
+#define iminor(i) minor((i)->i_rdev)
+#define imajor(i) major((i)->i_rdev)
+#define old_encode_dev(d) ( (major(d)<<8) | minor(d) )
 #define old_decode_dev(rdev)  (kdev_t_to_nr(mk_kdev((rdev)>>8, (rdev)&0xff)))
 #define old_valid_dev(d) (1)
 #endif




More information about the linux-mtd-cvs mailing list