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/ufs | |
| parent | 71118c319fcae4a138f16e35b4f7e0a6d53ce2ca (diff) | |
Merge with Linux 2.4.2.
Diffstat (limited to 'fs/ufs')
| -rw-r--r-- | fs/ufs/super.c | 2 | ||||
| -rw-r--r-- | fs/ufs/util.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/fs/ufs/super.c b/fs/ufs/super.c index 6d83d7c51..360291513 100644 --- a/fs/ufs/super.c +++ b/fs/ufs/super.c @@ -73,7 +73,7 @@ #include <linux/errno.h> #include <linux/fs.h> #include <linux/ufs_fs.h> -#include <linux/malloc.h> +#include <linux/slab.h> #include <linux/sched.h> #include <linux/stat.h> #include <linux/string.h> diff --git a/fs/ufs/util.c b/fs/ufs/util.c index 334e0efdb..54a0ab80f 100644 --- a/fs/ufs/util.c +++ b/fs/ufs/util.c @@ -7,7 +7,7 @@ */ #include <linux/string.h> -#include <linux/malloc.h> +#include <linux/slab.h> #include <linux/locks.h> #include "swab.h" |