diff options
| author | Linus Torvalds <torvalds@athlon.transmeta.com> | 2002-02-04 17:57:11 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@athlon.transmeta.com> | 2002-02-04 17:57:11 -0800 |
| commit | c8ebfc888f9ee93f2dc7cd62b3be66263755d99a (patch) | |
| tree | f449a3433c022ed8fd9aaa8f291a1b4e354fd5b9 /drivers/fc4 | |
| parent | 5d12a58c4049a4839abbbdf87dd189505513b1b6 (diff) | |
v2.4.1.2 -> v2.4.1.3
- Jens: better ordering of requests when unable to merge
- Neil Brown: make md work as a module again (we cannot autodetect
in modules, not enough background information)
- Neil Brown: raid5 SMP locking cleanups
- Neil Brown: nfsd: handle Irix NFS clients named pipe behavior and
dentry leak fix
- maestro3 shutdown fix
- fix dcache hash calculation that could cause bad hashes under certain
circumstances (Dean Gaudet)
- David Miller: networking and sparc updates
- Jeff Garzik: include file cleanups
- Andy Grover: ACPI update
- Coda-fs error return fixes
- rth: alpha Jensen update
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 4123a73649ab..7c1ee6927e6b 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 329c2ae45f22..e78f781fc481 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 51f7b095d2d3..0dc30e22e096 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> |