From c8ebfc888f9ee93f2dc7cd62b3be66263755d99a Mon Sep 17 00:00:00 2001
From: Linus Torvalds <torvalds@athlon.transmeta.com>
Date: Mon, 4 Feb 2002 17:57:11 -0800
Subject: v2.4.1.2 -> v2.4.1.3

  - Jens: better ordering of requests when unable to merge
  - Neil Brown: make md work as a module again (we cannot autodetect
  in modules, not enough background information)
  - Neil Brown: raid5 SMP locking cleanups
  - Neil Brown: nfsd: handle Irix NFS clients named pipe behavior and
  dentry leak fix
  - maestro3 shutdown fix
  - fix dcache hash calculation that could cause bad hashes under certain
  circumstances (Dean Gaudet)
  - David Miller: networking and sparc updates
  - Jeff Garzik: include file cleanups
  - Andy Grover: ACPI update
  - Coda-fs error return fixes
  - rth: alpha Jensen update
---
 drivers/input/joydev.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'drivers/input/joydev.c')

diff --git a/drivers/input/joydev.c b/drivers/input/joydev.c
index 4e12f55b7234..d3323f733c6f 100644
--- a/drivers/input/joydev.c
+++ b/drivers/input/joydev.c
@@ -38,7 +38,7 @@
 #include <linux/input.h>
 #include <linux/kernel.h>
 #include <linux/major.h>
-#include <linux/malloc.h>
+#include <linux/slab.h>
 #include <linux/mm.h>
 #include <linux/miscdevice.h>
 #include <linux/module.h>
-- 
cgit v1.2.3