From: David Schleef <ds@schleef.org>
Date: Sat, 1 Dec 2001 04:48:09 +0000 (+0000)
Subject: Change malloc.h to slab.h.  Fixed header references to modbuild
X-Git-Tag: r0_7_62~81
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=2adf49ba2876a02bb4ea972a337ba13da087022c;p=comedi.git

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 bcea825c..43febdd4 100644
--- 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 49756ffe..411a7c10 100644
--- 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 aeb1d292..acae24c7 100644
--- 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 25a93caf..db968511 100644
--- 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