diff options
| author | Ralf Baechle <ralf@linux-mips.org> | 1999-02-15 02:15:32 +0000 |
|---|---|---|
| committer | Ralf Baechle <ralf@linux-mips.org> | 1999-02-15 02:15:32 +0000 |
| commit | 86464aed71025541805e7b1515541aee89879e33 (patch) | |
| tree | e01a457a4912a8553bc65524aa3125d51f29f810 /drivers/net/via-rhine.c | |
| parent | 88f99939ecc6a95a79614574cb7d95ffccfc3466 (diff) | |
Merge with Linux 2.2.1.
Diffstat (limited to 'drivers/net/via-rhine.c')
| -rw-r--r-- | drivers/net/via-rhine.c | 13 |
1 files changed, 1 insertions, 12 deletions
diff --git a/drivers/net/via-rhine.c b/drivers/net/via-rhine.c index fead49fcb..19a937c41 100644 --- a/drivers/net/via-rhine.c +++ b/drivers/net/via-rhine.c @@ -64,19 +64,9 @@ static const int multicast_filter_limit = 32; #define PKT_BUF_SZ 1536 /* Size of each temporary Rx buffer.*/ -/* Include files, designed to support most kernel versions 2.0.0 and later. */ -#include <linux/version.h> -#ifdef MODULE -#ifdef MODVERSIONS -#include <linux/modversions.h> -#endif #include <linux/module.h> -#else -#define MOD_INC_USE_COUNT -#define MOD_DEC_USE_COUNT -#endif - #include <linux/kernel.h> +#include <linux/version.h> #include <linux/string.h> #include <linux/timer.h> #include <linux/errno.h> @@ -115,7 +105,6 @@ static const int multicast_filter_limit = 32; #define RUN_AT(x) (jiffies + (x)) #if (LINUX_VERSION_CODE >= 0x20100) -char kernel_version[] = UTS_RELEASE; #else #ifndef __alpha__ #define ioremap vremap |