fixes for 2.2 compile

diff --git a/Makefile.modbuild b/Makefile.modbuild
index 0635a1f4e8f2f93b2c3a5c5a29fe475f9a464743..86b51f131777fa7cd9ad9e10589fd37c310b8bb6 100644 (file)
--- a/Makefile.modbuild
+++ b/Makefile.modbuild
@@ -68,6 +68,7 @@ config:       dummy
        $(CONFIG_SHELL) ./configure
 
 modules_install:       $(patsubst %, _modinst_%, $(SUBDIRS))
+       depmod -a
 
 _modinst_%:
        $(MAKE) -C $(patsubst _modinst_%, %, $@) modules_install

diff --git a/comedi/comedi_fops.c b/comedi/comedi_fops.c
index 6806178a6e3d339c7358e257ae0eda3eea7125ac..cea8feec8b9b4143e4f7e6b14557371830c740e1 100644 (file)
--- a/comedi/comedi_fops.c
+++ b/comedi/comedi_fops.c
@@ -35,6 +35,7 @@
 #include <linux/slab.h>
 #include <linux/kmod.h>
 #include <linux/poll.h>
+#include <linux/init.h>
 
 #include <linux/comedidev.h>
 

diff --git a/comedi/rt.c b/comedi/rt.c
index 4ca63814da0aafcd77b44d2560d340ffdde9e8ae..59ae543afc2abfc22861ad8b037efa5b4e7b57df 100644 (file)
--- a/comedi/rt.c
+++ b/comedi/rt.c
@@ -36,7 +36,7 @@
 #include <linux/irq.h>
 #include <asm/io.h>
 
-#include "rt_pend_tq/rt_pend_tq.h"
+#include "rt_pend_tq.h"
 
 #ifdef CONFIG_COMEDI_RTAI
 #include <rtai.h>

diff --git a/include/linux/comedidev.h b/include/linux/comedidev.h
index 61819fded1a884fb3f74461473239474ee0d52aa..0a89dde2edb75e2ea81fcf2b2c1540446d3f0c99 100644 (file)
--- a/include/linux/comedidev.h
+++ b/include/linux/comedidev.h
@@ -32,6 +32,7 @@
 #include <linux/spinlock.h>
 #include <linux/wait.h>
 #include <linux/mm.h>
+#include <linux/init.h>
 
 #include <linux/comedi.h>
 

diff --git a/include/linux/init.h b/include/linux/init.h
index 5ada737be751a9b1f121bac34016c9a29eb73ce3..0fe3fe0d0fd6205d79c36fc98daf1cd3e123c4d9 100644 (file)
--- a/include/linux/init.h
+++ b/include/linux/init.h
@@ -9,6 +9,7 @@
 
 #if LINUX_VERSION_CODE < 0x020400
 #define __devinitdata __initdata
+#define __exit
 #endif
 #include_next <linux/init.h>