diff options
Diffstat (limited to 'drivers/char/rio')
-rw-r--r-- | drivers/char/rio/rio.h | 2 | ||||
-rw-r--r-- | drivers/char/rio/rio_linux.c | 2 | ||||
-rw-r--r-- | drivers/char/rio/rioboot.c | 2 | ||||
-rw-r--r-- | drivers/char/rio/riocmd.c | 3 | ||||
-rw-r--r-- | drivers/char/rio/rioctrl.c | 2 | ||||
-rw-r--r-- | drivers/char/rio/rioinfo.h | 2 | ||||
-rw-r--r-- | drivers/char/rio/rioinit.c | 2 | ||||
-rw-r--r-- | drivers/char/rio/riointr.c | 3 | ||||
-rw-r--r-- | drivers/char/rio/rioparam.c | 3 | ||||
-rw-r--r-- | drivers/char/rio/rioroute.c | 2 | ||||
-rw-r--r-- | drivers/char/rio/riotable.c | 4 | ||||
-rw-r--r-- | drivers/char/rio/riotty.c | 3 |
12 files changed, 17 insertions, 13 deletions
diff --git a/drivers/char/rio/rio.h b/drivers/char/rio/rio.h index 23f90a1b4..a66e4efa2 100644 --- a/drivers/char/rio/rio.h +++ b/drivers/char/rio/rio.h @@ -224,7 +224,7 @@ static char *_rio_h_sccs_ = "@(#)rio.h 1.3"; #define RIO_IPL 5 #define RIO_PRI (PZERO+10) -#define RIO_CLOSE_PRI PZERO-1 /* uninteruptible sleeps for close */ +#define RIO_CLOSE_PRI PZERO-1 /* uninterruptible sleeps for close */ typedef struct DbInf { diff --git a/drivers/char/rio/rio_linux.c b/drivers/char/rio/rio_linux.c index 6b0e3d298..5b1ae925c 100644 --- a/drivers/char/rio/rio_linux.c +++ b/drivers/char/rio/rio_linux.c @@ -56,7 +56,7 @@ #include <linux/tqueue.h> #include <linux/version.h> #include <linux/pci.h> -#include <linux/malloc.h> +#include <linux/slab.h> #include <linux/miscdevice.h> #include <linux/compatmac.h> diff --git a/drivers/char/rio/rioboot.c b/drivers/char/rio/rioboot.c index d5ab5ba02..c1e2ca818 100644 --- a/drivers/char/rio/rioboot.c +++ b/drivers/char/rio/rioboot.c @@ -36,7 +36,7 @@ static char *_rioboot_c_sccs_ = "@(#)rioboot.c 1.3"; #define __NO_VERSION__ #include <linux/module.h> -#include <linux/malloc.h> +#include <linux/slab.h> #include <linux/errno.h> #include <asm/io.h> #include <asm/system.h> diff --git a/drivers/char/rio/riocmd.c b/drivers/char/rio/riocmd.c index 3a330a07c..f651ed9e8 100644 --- a/drivers/char/rio/riocmd.c +++ b/drivers/char/rio/riocmd.c @@ -36,8 +36,9 @@ static char *_riocmd_c_sccs_ = "@(#)riocmd.c 1.2"; #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> diff --git a/drivers/char/rio/rioctrl.c b/drivers/char/rio/rioctrl.c index af61dc997..4a088353a 100644 --- a/drivers/char/rio/rioctrl.c +++ b/drivers/char/rio/rioctrl.c @@ -36,7 +36,7 @@ static char *_rioctrl_c_sccs_ = "@(#)rioctrl.c 1.3"; #define __NO_VERSION__ #include <linux/module.h> -#include <linux/malloc.h> +#include <linux/slab.h> #include <linux/errno.h> #include <asm/io.h> #include <asm/system.h> diff --git a/drivers/char/rio/rioinfo.h b/drivers/char/rio/rioinfo.h index 11bc3e5d3..e08421c95 100644 --- a/drivers/char/rio/rioinfo.h +++ b/drivers/char/rio/rioinfo.h @@ -44,7 +44,7 @@ struct RioHostInfo { long location; /* RIO Card Base I/O address */ long vector; /* RIO Card IRQ vector */ int bus; /* ISA/EISA/MCA/PCI */ - int mode; /* pointer to host mode - INTERUPT / POLLED */ + int mode; /* pointer to host mode - INTERRUPT / POLLED */ struct old_sgttyb * Sg; /* pointer to default term characteristics */ }; diff --git a/drivers/char/rio/rioinit.c b/drivers/char/rio/rioinit.c index cbefdac2d..6ab8175c7 100644 --- a/drivers/char/rio/rioinit.c +++ b/drivers/char/rio/rioinit.c @@ -36,7 +36,7 @@ static char *_rioinit_c_sccs_ = "@(#)rioinit.c 1.3"; #define __NO_VERSION__ #include <linux/config.h> #include <linux/module.h> -#include <linux/malloc.h> +#include <linux/slab.h> #include <linux/errno.h> #include <asm/io.h> #include <asm/system.h> diff --git a/drivers/char/rio/riointr.c b/drivers/char/rio/riointr.c index f52124b78..c97f88640 100644 --- a/drivers/char/rio/riointr.c +++ b/drivers/char/rio/riointr.c @@ -36,8 +36,9 @@ static char *_riointr_c_sccs_ = "@(#)riointr.c 1.2"; #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> diff --git a/drivers/char/rio/rioparam.c b/drivers/char/rio/rioparam.c index 4ce8443c3..069172fec 100644 --- a/drivers/char/rio/rioparam.c +++ b/drivers/char/rio/rioparam.c @@ -36,8 +36,9 @@ static char *_rioparam_c_sccs_ = "@(#)rioparam.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> diff --git a/drivers/char/rio/rioroute.c b/drivers/char/rio/rioroute.c index ab78ddf5d..b621005dc 100644 --- a/drivers/char/rio/rioroute.c +++ b/drivers/char/rio/rioroute.c @@ -35,7 +35,7 @@ static char *_rioroute_c_sccs_ = "@(#)rioroute.c 1.3"; #define __NO_VERSION__ #include <linux/module.h> -#include <linux/malloc.h> +#include <linux/slab.h> #include <linux/errno.h> #include <asm/io.h> #include <asm/system.h> diff --git a/drivers/char/rio/riotable.c b/drivers/char/rio/riotable.c index 2b82c25ad..51f87de11 100644 --- a/drivers/char/rio/riotable.c +++ b/drivers/char/rio/riotable.c @@ -35,7 +35,7 @@ static char *_riotable_c_sccs_ = "@(#)riotable.c 1.2"; #define __NO_VERSION__ #include <linux/module.h> -#include <linux/malloc.h> +#include <linux/slab.h> #include <linux/errno.h> #include <asm/io.h> #include <asm/system.h> @@ -696,7 +696,7 @@ int RIOAssignRta( struct rio_info *p, struct Map *MapP ) /* ** Now we have a host we need to allocate an ID - ** if the the entry does not already have one. + ** if the entry does not already have one. */ if (MapP->ID == (ushort)-1) { 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> |