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/fc4 | |
| parent | 71118c319fcae4a138f16e35b4f7e0a6d53ce2ca (diff) | |
Merge with Linux 2.4.2.
Diffstat (limited to 'drivers/fc4')
| -rw-r--r-- | drivers/fc4/fc.c | 2 | ||||
| -rw-r--r-- | drivers/fc4/soc.c | 2 | ||||
| -rw-r--r-- | drivers/fc4/socal.c | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/drivers/fc4/fc.c b/drivers/fc4/fc.c index 4123a7364..7c1ee6927 100644 --- a/drivers/fc4/fc.c +++ b/drivers/fc4/fc.c @@ -30,7 +30,7 @@ #include <linux/ptrace.h> #include <linux/ioport.h> #include <linux/in.h> -#include <linux/malloc.h> +#include <linux/slab.h> #include <linux/string.h> #include <linux/init.h> #include <linux/blk.h> diff --git a/drivers/fc4/soc.c b/drivers/fc4/soc.c index 329c2ae45..e78f781fc 100644 --- a/drivers/fc4/soc.c +++ b/drivers/fc4/soc.c @@ -29,7 +29,7 @@ static char *version = #include <linux/ptrace.h> #include <linux/ioport.h> #include <linux/in.h> -#include <linux/malloc.h> +#include <linux/slab.h> #include <linux/string.h> #include <linux/init.h> #include <asm/bitops.h> diff --git a/drivers/fc4/socal.c b/drivers/fc4/socal.c index 51f7b095d..0dc30e22e 100644 --- a/drivers/fc4/socal.c +++ b/drivers/fc4/socal.c @@ -24,7 +24,7 @@ static char *version = #include <linux/ptrace.h> #include <linux/ioport.h> #include <linux/in.h> -#include <linux/malloc.h> +#include <linux/slab.h> #include <linux/string.h> #include <linux/init.h> #include <asm/system.h> |