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.

---
 arch/mips/gt64120/common/irq.c         | 2 +-
 arch/mips/gt64120/common/pci.c         | 2 +-
 arch/mips/gt64120/momenco_ocelot/irq.c | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

(limited to 'arch/mips/gt64120')

diff --git a/arch/mips/gt64120/common/irq.c b/arch/mips/gt64120/common/irq.c
index c0fdcc44a..5192dfa1e 100644
--- a/arch/mips/gt64120/common/irq.c
+++ b/arch/mips/gt64120/common/irq.c
@@ -41,7 +41,7 @@
 #include <linux/interrupt.h>
 #include <linux/ioport.h>
 #include <linux/timex.h>
-#include <linux/malloc.h>
+#include <linux/slab.h>
 #include <linux/random.h>
 #include <linux/irq.h>
 #include <asm/bitops.h>
diff --git a/arch/mips/gt64120/common/pci.c b/arch/mips/gt64120/common/pci.c
index d6b647e11..e74b86bd6 100644
--- a/arch/mips/gt64120/common/pci.c
+++ b/arch/mips/gt64120/common/pci.c
@@ -39,7 +39,7 @@
 #include <linux/types.h>
 #include <linux/pci.h>
 #include <linux/kernel.h>
-#include <linux/malloc.h>
+#include <linux/slab.h>
 #include <linux/version.h>
 #include <asm/pci.h>
 #include <asm/io.h>
diff --git a/arch/mips/gt64120/momenco_ocelot/irq.c b/arch/mips/gt64120/momenco_ocelot/irq.c
index 8d832aadb..407031e6a 100644
--- a/arch/mips/gt64120/momenco_ocelot/irq.c
+++ b/arch/mips/gt64120/momenco_ocelot/irq.c
@@ -37,7 +37,7 @@
 #include <linux/interrupt.h>
 #include <linux/ioport.h>
 #include <linux/timex.h>
-#include <linux/malloc.h>
+#include <linux/slab.h>
 #include <linux/random.h>
 #include <linux/irq.h>
 #include <asm/bitops.h>
-- 
cgit v1.2.3