fedora core 6 1.2949 + vserver 2.2.0

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

diff --git a/drivers/net/sunhme.h b/drivers/net/sunhme.h
index f2784d2..90f446d 100644 (file)
--- a/drivers/net/sunhme.h
+++ b/drivers/net/sunhme.h
@@ -8,7 +8,6 @@
 #ifndef _SUNHME_H
 #define _SUNHME_H
 
-#include <linux/config.h>
 #include <linux/pci.h>
 
 /* Happy Meal global registers. */
@@ -397,7 +396,7 @@ struct quattro;
 
 /* Happy happy, joy joy! */
 struct happy_meal {
-       unsigned long   gregs;                  /* Happy meal global registers       */
+       void __iomem    *gregs;                 /* Happy meal global registers       */
        struct hmeal_init_block  *happy_block;  /* RX and TX descriptors (CPU addr)  */
 
 #if defined(CONFIG_SBUS) && defined(CONFIG_PCI)
@@ -423,14 +422,14 @@ struct happy_meal {
        struct net_device_stats   net_stats;      /* Statistical counters              */
 
 #if defined(CONFIG_SBUS) && defined(CONFIG_PCI)
-       u32 (*read32)(unsigned long);
-       void (*write32)(unsigned long, u32);
+       u32 (*read32)(void __iomem *);
+       void (*write32)(void __iomem *, u32);
 #endif
 
-       unsigned long   etxregs;        /* External transmitter regs         */
-       unsigned long   erxregs;        /* External receiver regs            */
-       unsigned long   bigmacregs;     /* BIGMAC core regs                  */
-       unsigned long   tcvregs;        /* MIF transceiver regs              */
+       void __iomem    *etxregs;        /* External transmitter regs        */
+       void __iomem    *erxregs;        /* External receiver regs           */
+       void __iomem    *bigmacregs;     /* BIGMAC core regs                 */
+       void __iomem    *tcvregs;        /* MIF transceiver regs             */
 
        dma_addr_t                hblock_dvma;    /* DVMA visible address happy block  */
        unsigned int              happy_flags;    /* Driver state flags                */
@@ -461,7 +460,6 @@ struct happy_meal {
        struct net_device        *dev;          /* Backpointer                       */
        struct quattro           *qfe_parent;   /* For Quattro cards                 */
        int                       qfe_ent;      /* Which instance on quattro         */
-       struct happy_meal         *next_module;
 };
 
 /* Here are the happy flags. */