diff options
| author | Ralf Baechle <ralf@linux-mips.org> | 2001-03-09 20:33:35 +0000 |
|---|---|---|
| committer | Ralf Baechle <ralf@linux-mips.org> | 2001-03-09 20:33:35 +0000 |
| commit | 116674acc97ba75a720329996877077d988443a2 (patch) | |
| tree | 6a3f2ff0b612ae2ee8a3f3509370c9e6333a53b3 /fs/qnx4 | |
| parent | 71118c319fcae4a138f16e35b4f7e0a6d53ce2ca (diff) | |
Merge with Linux 2.4.2.
Diffstat (limited to 'fs/qnx4')
| -rw-r--r-- | fs/qnx4/inode.c | 2 | ||||
| -rw-r--r-- | fs/qnx4/truncate.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/fs/qnx4/inode.c b/fs/qnx4/inode.c index c40f488e5..490c3d047 100644 --- a/fs/qnx4/inode.c +++ b/fs/qnx4/inode.c @@ -17,7 +17,7 @@ #include <linux/types.h> #include <linux/string.h> #include <linux/errno.h> -#include <linux/malloc.h> +#include <linux/slab.h> #include <linux/qnx4_fs.h> #include <linux/fs.h> #include <linux/locks.h> diff --git a/fs/qnx4/truncate.c b/fs/qnx4/truncate.c index a25bf1daf..9dad91a17 100644 --- a/fs/qnx4/truncate.c +++ b/fs/qnx4/truncate.c @@ -13,7 +13,7 @@ #include <linux/config.h> #include <linux/types.h> #include <linux/errno.h> -#include <linux/malloc.h> +#include <linux/slab.h> #include <linux/qnx4_fs.h> #include <linux/fs.h> #include <linux/locks.h> |