Change malloc.h to slab.h. Fixed header references to modbuild

directory.

diff --git a/include/linux/comedi_rt.h b/include/linux/comedi_rt.h
index bcea825c8e99105fcd0a22e32ccdfee0603f0574..43febdd48ff66fe6cac1a12de64da1026cb83c7d 100644 (file)
--- a/include/linux/comedi_rt.h
+++ b/include/linux/comedi_rt.h
@@ -32,14 +32,14 @@
 #include <linux/config.h>
 #include <linux/kdev_t.h>
 #include <linux/config.h>
-#include <linux/malloc.h>
+#include <linux/slab.h>
 #include <linux/errno.h>
 #include <linux/spinlock.h>
 
 #ifdef CONFIG_COMEDI_RT
 
 #ifdef CONFIG_COMEDI_RTAI
-#include <rtai/rtai.h>
+#include <rtai.h>
 #endif
 #ifdef CONFIG_COMEDI_RTL
 #include <rtl_core.h>

diff --git a/include/linux/comedidev.h b/include/linux/comedidev.h
index 49756ffeb815616cdda59da7a3bd442d30990b0a..411a7c1071dec3e0a9b4cb92bdcb13a9ef893957 100644 (file)
--- a/include/linux/comedidev.h
+++ b/include/linux/comedidev.h
@@ -27,7 +27,7 @@
 #include <linux/version.h>
 #include <linux/config.h>
 #include <linux/kdev_t.h>
-#include <linux/malloc.h>
+#include <linux/slab.h>
 #include <linux/errno.h>
 #include <linux/spinlock.h>
 

diff --git a/include/linux/config.h b/include/linux/config.h
index aeb1d2927de9b9922fedc79fe5d2d3a95b28f510..acae24c764324c79478c53c14d11d098a4703317 100644 (file)
--- a/include/linux/config.h
+++ b/include/linux/config.h
@@ -1,9 +1,9 @@
 #ifndef __MULTI_CONFIG_H_
 #define __MULTI_CONFIG_H_
 
-#include <modbuild/config.h>
+#include <config.h>
 #ifdef CONFIG_COMEDI_RTAI
-#include_next <modbuild/config.h>
+//#include <modbuild/config.h>
 #endif
 #include_next <linux/config.h>
 

diff --git a/include/linux/version.h b/include/linux/version.h
index 25a93caf0c7848e18b747621586b4bfd1299a932..db9685110927fd19d712f6742fed99a632a5860d 100644 (file)
--- a/include/linux/version.h
+++ b/include/linux/version.h
@@ -1,7 +1,7 @@
 #ifndef __MULTI_VERSION_H_
 #define __MULTI_VERSION_H_
 
-#include <modbuild/version.h>
+#include <version.h>
 #include_next <linux/version.h>
 
 #ifndef KERNEL_VERSION