mtd/include/linux/mtd compatmac.h,1.76,1.77

gleixner at infradead.org gleixner at infradead.org
Fri Jul 1 04:36:30 EDT 2005


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

Modified Files:
	compatmac.h 
Log Message:
Keep the code in sync with mainline and keep the compat hacks in compatmac.h

Index: compatmac.h
===================================================================
RCS file: /home/cvs/mtd/include/linux/mtd/compatmac.h,v
retrieving revision 1.76
retrieving revision 1.77
diff -u -r1.76 -r1.77
--- compatmac.h	30 Jun 2005 12:15:57 -0000	1.76
+++ compatmac.h	1 Jul 2005 08:36:27 -0000	1.77
@@ -197,6 +197,10 @@
 #define __iomem
 #endif
 
+#if LINUX_VERSION_CODE <= KERNEL_VERSION(2,6,12)
+#define try_to_freeze() try_to_freeze(0)
+#endif
+
 #if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,11)
 #define CURRENT_TIME_SEC ((struct timespec) { xtime.tv_sec, 0 })
 #include <linux/sched.h>
@@ -211,10 +215,7 @@
 }
 #endif
 
-#if LINUX_VERSION_CODE > KERNEL_VERSION(2,6,12)
-#define MTD_FREEZE_FLAGS(x)
-#else
-#define MTD_FREEZE_FLAGS(x) (x)
+#if LINUX_VERSION_CODE <= KERNEL_VERSION(2,6,12)
 #endif
 
 #ifndef list_for_each_entry_safe





More information about the linux-mtd-cvs mailing list