From 3bd3b14781b86b0e9540a4d456a555a013dc19a1 Mon Sep 17 00:00:00 2001
From: David Schleef <ds@schleef.org>
Date: Sun, 15 Oct 2000 21:50:14 +0000
Subject: [PATCH] patch from Tomasz

---
 Makefile.modbuild             | 2 +-
 comedi/Config.in              | 6 ++++++
 comedi/drivers/daqboard2000.c | 2 +-
 comedi/drivers/dt3000.c       | 1 +
 comedi/realtime/vd_dds.c      | 2 +-
 scripts/dep.rtlinux           | 5 ++++-
 6 files changed, 14 insertions(+), 4 deletions(-)

diff --git a/Makefile.modbuild b/Makefile.modbuild
index f77ac6ff..c26ec0d3 100644
--- a/Makefile.modbuild
+++ b/Makefile.modbuild
@@ -52,7 +52,7 @@ CFLAGS += $(shell if $(CC) -fno-strict-aliasing -S -o /dev/null -xc /dev/null >/
 CFLAGS += -D__KERNEL__ -I $(TOPDIR)/include -I $(LINUXDIR)/include -I .
 CFLAGS += -D__MODBUILD__
 ifdef RTLDIR
-CFLAGS += -I $(RTLDIR)/include
+CFLAGS += -I $(RTLDIR)/include -D__RT__
 endif
 
 CONFIG_SHELL := sh
diff --git a/comedi/Config.in b/comedi/Config.in
index e0a13b73..afbe2c21 100644
--- a/comedi/Config.in
+++ b/comedi/Config.in
@@ -15,6 +15,12 @@ if [ "$CONFIG_RTL" = "y" ];then
 		define_bool CONFIG_COMEDI_RTL y
 	fi
 fi
+if [ "$CONFIG_RTL_V1" = "y" ];then
+	bool 'Real-time v1 support' CONFIG_COMEDI_RT
+	if [ "$CONFIG_COMEDI_RT" = "y" ];then
+		define_bool CONFIG_COMEDI_RTL_V1 y
+	fi
+fi
 if [ "$CONFIG_RTHAL" = "y" ];then
 	bool 'Real-time support' CONFIG_COMEDI_RT
 	if [ "$CONFIG_COMEDI_RT" = "y" ];then
diff --git a/comedi/drivers/daqboard2000.c b/comedi/drivers/daqboard2000.c
index f6d816d7..b5019c7d 100644
--- a/comedi/drivers/daqboard2000.c
+++ b/comedi/drivers/daqboard2000.c
@@ -108,7 +108,7 @@
 #include <linux/timer.h>
 #include <linux/pci.h>
 #include <asm/io.h>
-#include <asm/uaccess.h>
+/* no, comedi_module.h takes care about it #include <asm/uaccess.h> */
 #include <comedi_module.h>
 #include <8255.h>
 #ifdef CONFIG_COMEDI_DAQBOARD2000_FPGA
diff --git a/comedi/drivers/dt3000.c b/comedi/drivers/dt3000.c
index 2c5d023a..2c3821e4 100644
--- a/comedi/drivers/dt3000.c
+++ b/comedi/drivers/dt3000.c
@@ -502,6 +502,7 @@ static int setup_pci(comedi_device *dev);
 static int dt_pci_probe(comedi_device *dev)
 {
 	int board;
+	int ret;
 
 	ret=dt_pci_find_device(NULL,&board);
 	if(ret==0)
diff --git a/comedi/realtime/vd_dds.c b/comedi/realtime/vd_dds.c
index 220b4700..2ee28a76 100644
--- a/comedi/realtime/vd_dds.c
+++ b/comedi/realtime/vd_dds.c
@@ -52,7 +52,7 @@ static int dds_attach(comedi_device *dev,comedi_devconfig *it);
 static int dds_detach(comedi_device *dev);
 comedi_driver driver_vd_dds={
 	driver_name:		"vd_dds",
-	module:		&__this_module,
+	module:		THIS_MODULE,
 	attach:		dds_attach,
 	detach:		dds_detach,
 };
diff --git a/scripts/dep.rtlinux b/scripts/dep.rtlinux
index cfde9ec7..0d2dedfc 100755
--- a/scripts/dep.rtlinux
+++ b/scripts/dep.rtlinux
@@ -1,6 +1,9 @@
 #!/bin/sh
 
-if [ "$CONFIG_RTL" != "" ];then
+if [ -f "$LINUXDIR/include/asm/rt_irq.h" ]; then
+	CONFIG_RTL_V1="y"
+fi
+if [ "$CONFIG_RTL" != "" -o "$CONFIG_RTL_V1" = "y" ]; then
 	echo You appear to be running an RTL-patched kernel
 
 	default=${RTLDIR:=/usr/src/rtl}
-- 
2.26.2