Merge to Fedora kernel-2.6.18-1.2224_FC5 patched with stable patch-2.6.18.1-vs2.0...

[linux-2.6.git] / drivers / net / 8390.h

diff --git a/drivers/net/8390.h b/drivers/net/8390.h
index 58fd65e..a9a58f5 100644 (file)
--- a/drivers/net/8390.h
+++ b/drivers/net/8390.h
@@ -7,22 +7,11 @@
 #ifndef _8390_h
 #define _8390_h
 
-#include <linux/config.h>
 #include <linux/if_ether.h>
 #include <linux/ioport.h>
 #include <linux/skbuff.h>
 
-#define TX_2X_PAGES 12
-#define TX_1X_PAGES 6
-
-/* Should always use two Tx slots to get back-to-back transmits. */
-#define EI_PINGPONG
-
-#ifdef EI_PINGPONG
-#define TX_PAGES TX_2X_PAGES
-#else
-#define TX_PAGES TX_1X_PAGES
-#endif
+#define TX_PAGES 12    /* Two Tx slots */
 
 #define ETHER_ADDR_LEN 6
 
@@ -62,6 +51,7 @@ struct ei_device {
        void (*block_input)(struct net_device *, int, struct sk_buff *, int);
        unsigned long rmem_start;
        unsigned long rmem_end;
+       void __iomem *mem;
        unsigned char mcfilter[8];
        unsigned open:1;
        unsigned word16:1;              /* We have the 16-bit (vs 8-bit) version of the card. */
@@ -143,7 +133,7 @@ struct ei_device {
 #define inb_p(_p)      inb(_p)
 #define outb_p(_v,_p)  outb(_v,_p)
 
-#elif defined(CONFIG_NET_CBUS) || defined(CONFIG_NE_H8300) || defined(CONFIG_NE_H8300_MODULE)
+#elif defined(CONFIG_NE_H8300) || defined(CONFIG_NE_H8300_MODULE)
 #define EI_SHIFT(x)    (ei_local->reg_offset[x])
 #else
 #define EI_SHIFT(x)    (x)