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/riotable.c | |
| parent | 71118c319fcae4a138f16e35b4f7e0a6d53ce2ca (diff) | |
Merge with Linux 2.4.2.
Diffstat (limited to 'drivers/char/rio/riotable.c')
| -rw-r--r-- | drivers/char/rio/riotable.c | 4 |
1 files changed, 2 insertions, 2 deletions
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) { |