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/joystick/adi.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'drivers/char/joystick/adi.c')

diff --git a/drivers/char/joystick/adi.c b/drivers/char/joystick/adi.c
index a2f68d74e..5bdf269fc 100644
--- a/drivers/char/joystick/adi.c
+++ b/drivers/char/joystick/adi.c
@@ -34,7 +34,7 @@
 #include <linux/kernel.h>
 #include <linux/module.h>
 #include <linux/string.h>
-#include <linux/malloc.h>
+#include <linux/slab.h>
 #include <linux/input.h>
 #include <linux/gameport.h>
 #include <linux/init.h>
-- 
cgit v1.2.3