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/isofs | |
| parent | 71118c319fcae4a138f16e35b4f7e0a6d53ce2ca (diff) | |
Merge with Linux 2.4.2.
Diffstat (limited to 'fs/isofs')
| -rw-r--r-- | fs/isofs/dir.c | 2 | ||||
| -rw-r--r-- | fs/isofs/inode.c | 2 | ||||
| -rw-r--r-- | fs/isofs/joliet.c | 2 | ||||
| -rw-r--r-- | fs/isofs/namei.c | 2 | ||||
| -rw-r--r-- | fs/isofs/rock.c | 2 |
5 files changed, 5 insertions, 5 deletions
diff --git a/fs/isofs/dir.c b/fs/isofs/dir.c index 6f0957dce..48a358de8 100644 --- a/fs/isofs/dir.c +++ b/fs/isofs/dir.c @@ -17,7 +17,7 @@ #include <linux/stat.h> #include <linux/string.h> #include <linux/mm.h> -#include <linux/malloc.h> +#include <linux/slab.h> #include <linux/sched.h> #include <linux/locks.h> #include <linux/config.h> diff --git a/fs/isofs/inode.c b/fs/isofs/inode.c index 757a87070..90f511bda 100644 --- a/fs/isofs/inode.c +++ b/fs/isofs/inode.c @@ -20,7 +20,7 @@ #include <linux/mm.h> #include <linux/string.h> #include <linux/locks.h> -#include <linux/malloc.h> +#include <linux/slab.h> #include <linux/errno.h> #include <linux/cdrom.h> #include <linux/init.h> diff --git a/fs/isofs/joliet.c b/fs/isofs/joliet.c index 5b93f4581..2aac3a8bc 100644 --- a/fs/isofs/joliet.c +++ b/fs/isofs/joliet.c @@ -8,7 +8,7 @@ #include <linux/string.h> #include <linux/nls.h> -#include <linux/malloc.h> +#include <linux/slab.h> #include <linux/iso_fs.h> /* 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? */ diff --git a/fs/isofs/rock.c b/fs/isofs/rock.c index e20f3ad61..c351f7af0 100644 --- a/fs/isofs/rock.c +++ b/fs/isofs/rock.c @@ -11,7 +11,7 @@ #include <linux/iso_fs.h> #include <linux/string.h> #include <linux/mm.h> -#include <linux/malloc.h> +#include <linux/slab.h> #include <linux/pagemap.h> #include <linux/smp_lock.h> |