Fixes for compilation on 2.0.x

diff --git a/comedi/comedi_fops.c b/comedi/comedi_fops.c
index b998b46e00fd891f3dee2789068484feeaa9c1ff..0b4d9a53fb964952be176fb74c4812012408f0b0 100644 (file)
--- a/comedi/comedi_fops.c
+++ b/comedi/comedi_fops.c
@@ -1697,19 +1697,23 @@ static int comedi_close_v22(struct inode *inode,struct file *file)
 
        dev->use_count--;
 
+#if LINUX_VERSION_CODE >= 0x020100
        if(file->f_flags & FASYNC){
                comedi_fasync(-1,file,0);
        }
+#endif
 
        return 0;
 }
 
+#if LINUX_VERSION_CODE >= 0x020100
 static int comedi_fasync (int fd, struct file *file, int on)
 {
        comedi_device *dev=comedi_get_device_by_minor(MINOR(RDEV_OF_FILE(file)));
 
        return fasync_helper(fd,file,on,&dev->async_queue);
 }
+#endif
 
 /*
        kernel compatibility

diff --git a/comedi/kcomedilib/data.c b/comedi/kcomedilib/data.c
index a9e6fe0346f0fa96ffde9381d642214a251822fa..bb70b53dc4d26db94754e3d8475264c84d9e6807 100644 (file)
--- a/comedi/kcomedilib/data.c
+++ b/comedi/kcomedilib/data.c
@@ -36,9 +36,6 @@
 #include <linux/mm.h>
 #include <linux/malloc.h>
 #include <asm/io.h>
-#ifdef LINUX_V22
-#include <asm/uaccess.h>
-#endif
 
 #define USE_INSN
 

diff --git a/comedi/kcomedilib/dio.c b/comedi/kcomedilib/dio.c
index 7ed37bea545d6d0cc2eeeab5150be726ee468504..d2b9a819e44094a0ba68fb055c6d1c6a3c64fe3a 100644 (file)
--- a/comedi/kcomedilib/dio.c
+++ b/comedi/kcomedilib/dio.c
@@ -36,9 +36,6 @@
 #include <linux/mm.h>
 #include <linux/malloc.h>
 #include <asm/io.h>
-#ifdef LINUX_V22
-#include <asm/uaccess.h>
-#endif
 
 #define USE_INSN
 

diff --git a/comedi/kcomedilib/kcomedilib_main.c b/comedi/kcomedilib/kcomedilib_main.c
index f22e719051b11d18cc01a1b59016db249b393a2f..ac23ddca8d2fca9800ef3375ecc902fcde62902e 100644 (file)
--- a/comedi/kcomedilib/kcomedilib_main.c
+++ b/comedi/kcomedilib/kcomedilib_main.c
@@ -35,9 +35,6 @@
 #include <linux/mm.h>
 #include <linux/malloc.h>
 #include <asm/io.h>
-#ifdef LINUX_V22
-#include <asm/uaccess.h>
-#endif
 
 #include <linux/comedidev.h>
 #include <linux/comedi.h>

diff --git a/comedi/kcomedilib/ksyms.c b/comedi/kcomedilib/ksyms.c
index 5cf236c82764fb1bb9ed27058b76fd4bcd016f06..e7cfd4af25e0a3dc831859c6b52afc25ab61a940 100644 (file)
--- a/comedi/kcomedilib/ksyms.c
+++ b/comedi/kcomedilib/ksyms.c
@@ -39,7 +39,7 @@
 #include <linux/malloc.h>
 
 
-#ifdef LINUX_V22
+#if LINUX_VERSION_CODE >= 0x020200
 
 /* functions specific to kcomedilib */
 

diff --git a/comedi/proc.c b/comedi/proc.c
index c0733449e8ec95cb33c15672882f4173f00632d3..219e0a152467a96caffa5d27b3f9ee6bc029b805 100644 (file)
--- a/comedi/proc.c
+++ b/comedi/proc.c
@@ -34,7 +34,7 @@
 #include <linux/string.h>
 
 
-#ifdef LINUX_V20
+#if LINUX_VERSION_CODE < 0x020100
 int comedi_read_procmem(char *buf,char **start,off_t offset,int len,int unused);
 
 struct proc_dir_entry comedi_proc_entry =
@@ -56,7 +56,7 @@ int comedi_read_procmem(char *buf,char **start,off_t offset,int len,int *eof,voi
 
 extern comedi_driver *comedi_drivers;
 
-#ifdef LINUX_V20
+#if LINUX_VERSION_CODE < 0x020100
 int comedi_read_procmem(char *buf,char **start,off_t offset,int len,int unused)
 #else
 int comedi_read_procmem(char *buf,char **start,off_t offset,int len,int *eof,void *data)
@@ -107,7 +107,7 @@ int comedi_read_procmem(char *buf,char **start,off_t offset,int len,int *eof,voi
 
 void comedi_proc_init(void)
 {
-#ifdef LINUX_V20
+#if LINUX_VERSION_CODE < 0x020100
        proc_register_dynamic(&proc_root,&comedi_proc_entry);
 #else
        struct proc_dir_entry *comedi_proc;
@@ -120,7 +120,7 @@ void comedi_proc_init(void)
 
 void comedi_proc_cleanup(void)
 {
-#ifdef LINUX_V20
+#if LINUX_VERSION_CODE < 0x020100
        proc_unregister(&proc_root,comedi_proc_entry.low_ino);
 #else
        remove_proc_entry("comedi",0);