From 2ab75e8d385ce8d12d066988d7ddcb5f53b14a3a Mon Sep 17 00:00:00 2001 From: David Schleef Date: Sun, 15 Oct 2000 21:53:52 +0000 Subject: [PATCH] Patch from Tomasz --- Makefile | 8 ++++---- comedi/kern_compat.h | 4 ++-- comedi/rtl.c | 2 +- scripts/dep.rtlinux | 3 +++ 4 files changed, 10 insertions(+), 7 deletions(-) diff --git a/Makefile b/Makefile index 092089c7..c12217d6 100644 --- 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 716bb374..320ef752 100644 --- 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 6b127987..a60a6940 100644 --- a/comedi/rtl.c +++ b/comedi/rtl.c @@ -10,7 +10,7 @@ #include #include #include -#include +//#include #include #include diff --git a/scripts/dep.rtlinux b/scripts/dep.rtlinux index 0d2dedfc..dad2e71e 100755 --- 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 -- 2.26.2