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/rio/riotty.c | |
parent | 71118c319fcae4a138f16e35b4f7e0a6d53ce2ca (diff) |
Merge with Linux 2.4.2.
Diffstat (limited to 'drivers/char/rio/riotty.c')
-rw-r--r-- | drivers/char/rio/riotty.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/char/rio/riotty.c b/drivers/char/rio/riotty.c index c9134e3fc..aaa7a1f32 100644 --- a/drivers/char/rio/riotty.c +++ b/drivers/char/rio/riotty.c @@ -38,8 +38,9 @@ static char *_riotty_c_sccs_ = "@(#)riotty.c 1.3"; #define __NO_VERSION__ #include <linux/module.h> -#include <linux/malloc.h> +#include <linux/slab.h> #include <linux/errno.h> +#include <linux/tty.h> #include <asm/io.h> #include <asm/system.h> #include <asm/string.h> |