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 /drivers/char/ftape/zftape | |
| parent | 71118c319fcae4a138f16e35b4f7e0a6d53ce2ca (diff) | |
Merge with Linux 2.4.2.
Diffstat (limited to 'drivers/char/ftape/zftape')
| -rw-r--r-- | drivers/char/ftape/zftape/zftape-buffers.c | 2 | ||||
| -rw-r--r-- | drivers/char/ftape/zftape/zftape-init.c | 2 | ||||
| -rw-r--r-- | drivers/char/ftape/zftape/zftape-vtbl.c | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/drivers/char/ftape/zftape/zftape-buffers.c b/drivers/char/ftape/zftape/zftape-buffers.c index f3dace343..58197e429 100644 --- a/drivers/char/ftape/zftape/zftape-buffers.c +++ b/drivers/char/ftape/zftape/zftape-buffers.c @@ -26,7 +26,7 @@ #include <linux/errno.h> #include <linux/mm.h> -#include <linux/malloc.h> +#include <linux/slab.h> #include <asm/segment.h> #include <linux/zftape.h> diff --git a/drivers/char/ftape/zftape/zftape-init.c b/drivers/char/ftape/zftape/zftape-init.c index a57e3abc1..1f8e4edaa 100644 --- a/drivers/char/ftape/zftape/zftape-init.c +++ b/drivers/char/ftape/zftape/zftape-init.c @@ -29,7 +29,7 @@ #include <linux/kernel.h> #include <linux/signal.h> #include <linux/major.h> -#include <linux/malloc.h> +#include <linux/slab.h> #ifdef CONFIG_KMOD #include <linux/kmod.h> #endif diff --git a/drivers/char/ftape/zftape/zftape-vtbl.c b/drivers/char/ftape/zftape/zftape-vtbl.c index e4804ea2e..aa64ca7d1 100644 --- a/drivers/char/ftape/zftape/zftape-vtbl.c +++ b/drivers/char/ftape/zftape/zftape-vtbl.c @@ -30,7 +30,7 @@ #include <linux/errno.h> #include <linux/mm.h> -#include <linux/malloc.h> +#include <linux/slab.h> #include <asm/segment.h> #include <linux/zftape.h> |