From 116674acc97ba75a720329996877077d988443a2 Mon Sep 17 00:00:00 2001
From: Ralf Baechle <ralf@linux-mips.org>
Date: Fri, 9 Mar 2001 20:33:35 +0000
Subject: Merge with Linux 2.4.2.

---
 drivers/char/rocket.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'drivers/char/rocket.c')

diff --git a/drivers/char/rocket.c b/drivers/char/rocket.c
index 5cecdde40..8c950bf54 100644
--- a/drivers/char/rocket.c
+++ b/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>
-- 
cgit v1.2.3