summaryrefslogtreecommitdiffstats
path: root/fs/fifo.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/fifo.c
parent71118c319fcae4a138f16e35b4f7e0a6d53ce2ca (diff)
Merge with Linux 2.4.2.
Diffstat (limited to 'fs/fifo.c')
-rw-r--r--fs/fifo.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/fifo.c b/fs/fifo.c
index ee048ac02..f5738c126 100644
--- a/fs/fifo.c
+++ b/fs/fifo.c
@@ -10,7 +10,7 @@
*/
#include <linux/mm.h>
-#include <linux/malloc.h>
+#include <linux/slab.h>
#include <linux/smp_lock.h>
static void wait_for_partner(struct inode* inode, unsigned int* cnt)