patch-2.4.2 linux/drivers/char/rocket.c

• Lines: 18
• Date: Fri Feb 16 16:02:36 2001
• Orig file: v2.4.1/linux/drivers/char/rocket.c
• Orig date: Mon Oct 16 12:58:51 2000

diff -u --recursive --new-file v2.4.1/linux/drivers/char/rocket.c linux/drivers/char/rocket.c
@@ -51,7 +51,7 @@
 #define MODULE
 #endif
 
-#ifdef NEW_MODULES
+#if defined(NEW_MODULES) && defined(LOCAL_ROCKET_H)
 #ifdef MODVERSIONS
 #include <linux/modversions.h>
 #endif
@@ -66,7 +66,7 @@
 #include <linux/major.h>
 #include <linux/kernel.h>
 #include <linux/signal.h>
-#include <linux/malloc.h>
+#include <linux/slab.h>
 #include <linux/mm.h>
 
 #include <linux/sched.h>