patch from Tomasz

diff --git a/Makefile.modbuild b/Makefile.modbuild
index f77ac6ff24e7b645bbec4eb0722947abf22b40c6..c26ec0d3e8b100a29ded7893628255be7c88db02 100644 (file)
--- 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 e0a13b739a646deb7e574cd5a950bf005a7e1ba6..afbe2c21fe768e98eafd6d4815c9f6bedd39a611 100644 (file)
--- 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 f6d816d769f030a3900c7d8fb20a9d91e9d88bce..b5019c7d98081b5efc753c1217e46b1b668d9964 100644 (file)
--- 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 2c5d023abe0d7dad79e13a4e20d6424ef69fb40c..2c3821e46d0b46eb34c4f7f515edeb096e5c1e3b 100644 (file)
--- 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 220b4700d21214d826082a03ea7038b9d71f9726..2ee28a768ac3a5e1900cce8b851fcaf71acd2713 100644 (file)
--- 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 cfde9ec7ba7c93333f308054f7626bce6be74cf8..0d2dedfc7e03ad86d31119acceab42e05edcebfc 100755 (executable)
--- 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}