Patch from Tomasz

diff --git a/Makefile b/Makefile
index 092089c799954812339026f4c8bc7c0e17e72b95..c12217d693ffac6e2193de2c349721b391128e31 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -11,8 +11,8 @@ SUBDIRS := comedi
 include ./Makefile.modbuild
 
 dev:
-       mknod -m=666 /dev/comedi0 c 98 0
-       mknod -m=666 /dev/comedi1 c 98 0
-       mknod -m=666 /dev/comedi2 c 98 0
-       mknod -m=666 /dev/comedi3 c 98 0
+       -mknod -m 666 /dev/comedi0 c 98 0
+       -mknod -m 666 /dev/comedi1 c 98 0
+       -mknod -m 666 /dev/comedi2 c 98 0
+       -mknod -m 666 /dev/comedi3 c 98 0
 

diff --git a/comedi/kern_compat.h b/comedi/kern_compat.h
index 716bb37471c94fc78b788ad96c89c546647eb2b4..320ef752a530c6eb0096a4def2254f141b8ac676 100644 (file)
--- a/comedi/kern_compat.h
+++ b/comedi/kern_compat.h
@@ -193,7 +193,7 @@ static inline long interruptible_sleep_on_timeout(struct wait_queue ** p,
 
 #ifndef COMPAT_V22
 
-#if LINUX_VERSION_CODE < KERNEL_VERSION(2,3,5)
+#if LINUX_VERSION_CODE < KERNEL_VERSION(2,2,18)
 typedef struct wait_queue *wait_queue_head_t;
 #define DECLARE_WAITQUEUE(x,y) struct wait_queue x={y,NULL}
 #define init_waitqueue_head(x)
@@ -208,7 +208,7 @@ typedef struct wait_queue *wait_queue_head_t;
 
 #endif
 
-#if LINUX_VERSION_CODE < KERNEL_VERSION(2,3,0)         /* ? */
+#if LINUX_VERSION_CODE < KERNEL_VERSION(2,2,18)                /* ? */
 #if LINUX_VERSION_CODE < KERNEL_VERSION(2,1,0)
   #ifdef MODULE
     /* don't ask.  It works. */

diff --git a/comedi/rtl.c b/comedi/rtl.c
index 6b12798744e7505ca5e1547b56b37bf62d403e2d..a60a694079f3c02aba4b0adfda1b63fb8d448a1d 100644 (file)
--- a/comedi/rtl.c
+++ b/comedi/rtl.c
@@ -10,7 +10,7 @@
 #include <linux/kernel.h>
 #include <linux/string.h>
 #include <linux/sched.h>
-#include <linux/rtl.h>
+//#include <linux/rtl.h>
 #include <linux/string.h>
 #include <linux/errno.h>
 

diff --git a/scripts/dep.rtlinux b/scripts/dep.rtlinux
index 0d2dedfc7e03ad86d31119acceab42e05edcebfc..dad2e71e9bb7bb73a9ee14fadf1c4c661bac8900 100755 (executable)
--- a/scripts/dep.rtlinux
+++ b/scripts/dep.rtlinux
@@ -3,6 +3,9 @@
 if [ -f "$LINUXDIR/include/asm/rt_irq.h" ]; then
        CONFIG_RTL_V1="y"
 fi
+if [ "$CONFIG_RTLINUX" == "y" ]; then
+       CONFIG_RTL=y
+fi
 if [ "$CONFIG_RTL" != "" -o "$CONFIG_RTL_V1" = "y" ]; then
        echo You appear to be running an RTL-patched kernel