Fixes for 2.0.39

diff --git a/include/linux/comedidev.h b/include/linux/comedidev.h
index a4fe7668e14fedc2465a105e73218bf1069faddf..c664e358e89182d1e70692d10358e30529511bd2 100644 (file)
--- a/include/linux/comedidev.h
+++ b/include/linux/comedidev.h
@@ -347,6 +347,7 @@ static inline unsigned int bytes_per_sample( const comedi_subdevice *subd )
                return sizeof( sampl_t );
 }
 
+#if LINUX_VERSION_CODE >= 0x020200
 static inline unsigned long uvirt_to_kva(pgd_t *pgd, unsigned long adr)
 {
        unsigned long ret = 0UL;
@@ -376,6 +377,7 @@ static inline unsigned long kvirt_to_pa(unsigned long adr)
        ret = __pa(kva);
        return ret;
 }
+#endif
 
 int comedi_buf_put(comedi_async *async, sampl_t x);
 int comedi_buf_get(comedi_async *async, sampl_t *x);

diff --git a/include/linux/init.h b/include/linux/init.h
index 0fe3fe0d0fd6205d79c36fc98daf1cd3e123c4d9..52533737adba549bbcab9cfc7ee91d3685f2c509 100644 (file)
--- a/include/linux/init.h
+++ b/include/linux/init.h
@@ -11,7 +11,11 @@
 #define __devinitdata __initdata
 #define __exit
 #endif
+#if LINUX_VERSION_CODE < 0x020200
+#define __init
+#else
 #include_next <linux/init.h>
+#endif
 
 #endif
 

diff --git a/include/linux/vmalloc.h b/include/linux/vmalloc.h
index d24c4ae85a32d7b21da42274664a328182edb7ff..7811990e0ad348d51105b61df8002e035df23bad 100644 (file)
--- a/include/linux/vmalloc.h
+++ b/include/linux/vmalloc.h
@@ -12,6 +12,7 @@
 
 #else
 #include_next <linux/vmalloc.h>
+#endif
 
 #if LINUX_VERSION_CODE < KERNEL_VERSION(2, 2, 18)
 extern inline void * vmalloc_32(unsigned long size)
@@ -20,7 +21,6 @@ extern inline void * vmalloc_32(unsigned long size)
 }
 #endif // 2.2.18
 
-#endif
 
 #endif