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/yellowfin.c | |
| parent | 88f99939ecc6a95a79614574cb7d95ffccfc3466 (diff) | |
Merge with Linux 2.2.1.
Diffstat (limited to 'drivers/net/yellowfin.c')
| -rw-r--r-- | drivers/net/yellowfin.c | 17 |
1 files changed, 2 insertions, 15 deletions
diff --git a/drivers/net/yellowfin.c b/drivers/net/yellowfin.c index 3411fd189..410121e2e 100644 --- a/drivers/net/yellowfin.c +++ b/drivers/net/yellowfin.c @@ -63,17 +63,7 @@ static int full_duplex[MAX_UNITS] = {-1, -1, -1, -1, -1, -1, -1, -1}; /* Time in jiffies before concluding the transmitter is hung. */ #define TX_TIMEOUT ((2000*HZ)/1000) -#ifdef MODULE -#ifdef MODVERSIONS -#include <linux/modversions.h> -#endif #include <linux/module.h> -#include <linux/version.h> -#else -#define MOD_INC_USE_COUNT -#define MOD_DEC_USE_COUNT -#endif - #include <linux/kernel.h> #include <linux/sched.h> #include <linux/string.h> @@ -93,13 +83,10 @@ static int full_duplex[MAX_UNITS] = {-1, -1, -1, -1, -1, -1, -1, -1}; #include <linux/skbuff.h> /* Kernel compatibility defines, most common to the PCCard package. */ -#include <linux/version.h> /* Evil, but neccessary */ +#include <linux/version.h> /* Evil and unneccessary */ #define RUN_AT(x) (jiffies + (x)) -#if (LINUX_VERSION_CODE >= 0x20100) -char kernel_version[] = UTS_RELEASE; -#endif #if (LINUX_VERSION_CODE < 0x20123) #define test_and_set_bit(val, addr) set_bit(val, addr) #endif @@ -214,7 +201,7 @@ See Packet Engines confidential appendix (prototype chips only). static void yellowfin_timer(unsigned long data); enum capability_flags {HasMII=1, FullTxStatus=2}; -struct chip_info { +static struct chip_info { u16 vendor_id, device_id, device_id_mask, pci_flags; const char *name; void (*media_timer)(unsigned long data); |