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/autofs4 | |
| parent | 71118c319fcae4a138f16e35b4f7e0a6d53ce2ca (diff) | |
Merge with Linux 2.4.2.
Diffstat (limited to 'fs/autofs4')
| -rw-r--r-- | fs/autofs4/autofs_i.h | 2 | ||||
| -rw-r--r-- | fs/autofs4/inode.c | 2 | ||||
| -rw-r--r-- | fs/autofs4/waitq.c | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/fs/autofs4/autofs_i.h b/fs/autofs4/autofs_i.h index 20724eb1c..4dcdcaafc 100644 --- a/fs/autofs4/autofs_i.h +++ b/fs/autofs4/autofs_i.h @@ -20,7 +20,7 @@ #define AUTOFS_IOC_COUNT 32 #include <linux/kernel.h> -#include <linux/malloc.h> +#include <linux/slab.h> #include <linux/sched.h> #include <linux/string.h> #include <linux/wait.h> diff --git a/fs/autofs4/inode.c b/fs/autofs4/inode.c index dd7dd07ac..f23705aeb 100644 --- a/fs/autofs4/inode.c +++ b/fs/autofs4/inode.c @@ -11,7 +11,7 @@ * ------------------------------------------------------------------------- */ #include <linux/kernel.h> -#include <linux/malloc.h> +#include <linux/slab.h> #include <linux/file.h> #include <linux/locks.h> #include <asm/bitops.h> diff --git a/fs/autofs4/waitq.c b/fs/autofs4/waitq.c index a76cde227..9e5fe900f 100644 --- a/fs/autofs4/waitq.c +++ b/fs/autofs4/waitq.c @@ -10,7 +10,7 @@ * * ------------------------------------------------------------------------- */ -#include <linux/malloc.h> +#include <linux/slab.h> #include <linux/sched.h> #include <linux/signal.h> #include <linux/file.h> |