diff options
| author | Ralf Baechle <ralf@linux-mips.org> | 1999-01-04 16:03:48 +0000 |
|---|---|---|
| committer | Ralf Baechle <ralf@linux-mips.org> | 1999-01-04 16:03:48 +0000 |
| commit | 78c388aed2b7184182c08428db1de6c872d815f5 (patch) | |
| tree | 4b2003b1b4ceb241a17faa995da8dd1004bb8e45 /drivers/net/8390.h | |
| parent | eb7a5bf93aaa4be1d7c6181100ab7639e74d67f7 (diff) | |
Merge with Linux 2.1.131 and more MIPS goodies.
(Did I mention that CVS is buggy ...)
Diffstat (limited to 'drivers/net/8390.h')
| -rw-r--r-- | drivers/net/8390.h | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/drivers/net/8390.h b/drivers/net/8390.h index 4418fb28d..52d4e9c9b 100644 --- a/drivers/net/8390.h +++ b/drivers/net/8390.h @@ -178,6 +178,7 @@ struct ei_device { /* The new statistics table. */ struct net_device_stats stat; unsigned char *reg_offset; /* Register mapping table */ + unsigned long priv; /* Private field to store bus IDs etc. */ }; /* The maximum number of 8390 interrupt service routines called per IRQ. */ @@ -207,11 +208,11 @@ struct ei_device { #define E8390_PAGE1 0x40 /* using the two high-order bits */ #define E8390_PAGE2 0x80 /* Page 3 is invalid. */ - -#ifndef CONFIG_MAC -#define EI_SHIFT(x) (x) -#else +#if defined(CONFIG_MAC) || defined(CONFIG_AMIGA_PCMCIA) || \ + defined(CONFIG_ARIADNE2) || defined(CONFIG_ARIADNE2_MODULE) #define EI_SHIFT(x) (ei_local->reg_offset[x]) +#else +#define EI_SHIFT(x) (x) #endif #define E8390_CMD EI_SHIFT(0x00) /* The command register (for all pages) */ |