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/net/arlan.h | |
| parent | 71118c319fcae4a138f16e35b4f7e0a6d53ce2ca (diff) | |
Merge with Linux 2.4.2.
Diffstat (limited to 'drivers/net/arlan.h')
| -rw-r--r-- | drivers/net/arlan.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/net/arlan.h b/drivers/net/arlan.h index 0f3d5da3e..4b52ee59b 100644 --- a/drivers/net/arlan.h +++ b/drivers/net/arlan.h @@ -1,7 +1,7 @@ /* * Copyright (C) 1997 Cullen Jennings * Copyright (C) 1998 Elmer.Joandi@ut.ee, +37-255-13500 - * Gnu Public License applies + * GNU General Public License applies */ #include <linux/version.h> @@ -15,7 +15,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/timer.h> |