summaryrefslogtreecommitdiffstats
path: root/fs/isofs/namei.c
diff options
context:
space:
mode:
authorRalf Baechle <ralf@linux-mips.org>2001-03-09 20:33:35 +0000
committerRalf Baechle <ralf@linux-mips.org>2001-03-09 20:33:35 +0000
commit116674acc97ba75a720329996877077d988443a2 (patch)
tree6a3f2ff0b612ae2ee8a3f3509370c9e6333a53b3 /fs/isofs/namei.c
parent71118c319fcae4a138f16e35b4f7e0a6d53ce2ca (diff)
Merge with Linux 2.4.2.
Diffstat (limited to 'fs/isofs/namei.c')
-rw-r--r--fs/isofs/namei.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/isofs/namei.c b/fs/isofs/namei.c
index 3f44d9033..87fe121f8 100644
--- a/fs/isofs/namei.c
+++ b/fs/isofs/namei.c
@@ -12,7 +12,7 @@
#include <linux/string.h>
#include <linux/stat.h>
#include <linux/fcntl.h>
-#include <linux/malloc.h>
+#include <linux/slab.h>
#include <linux/errno.h>
#include <linux/config.h> /* Joliet? */