Fedora kernel-2.6.17-1.2142_FC4 patched with stable patch-2.6.17.4-vs2.0.2-rc26.diff

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

diff --git a/drivers/net/sunbmac.h b/drivers/net/sunbmac.h
index b4c5309..b0dbc51 100644 (file)
--- a/drivers/net/sunbmac.h
+++ b/drivers/net/sunbmac.h
@@ -303,10 +303,10 @@ enum bigmac_timer_state {
 };
 
 struct bigmac {
-       unsigned long   gregs;  /* QEC Global Registers               */
-       unsigned long   creg;   /* QEC BigMAC Channel Registers       */
-       unsigned long   bregs;  /* BigMAC Registers                   */
-       unsigned long   tregs;  /* BigMAC Transceiver                 */
+       void __iomem    *gregs; /* QEC Global Registers               */
+       void __iomem    *creg;  /* QEC BigMAC Channel Registers       */
+       void __iomem    *bregs; /* BigMAC Registers                   */
+       void __iomem    *tregs; /* BigMAC Transceiver                 */
        struct bmac_init_block  *bmac_block;    /* RX and TX descriptors */
        __u32                    bblock_dvma;   /* RX and TX descriptors */
 
@@ -339,7 +339,7 @@ struct bigmac {
 #define ALIGNED_RX_SKB_ADDR(addr) \
         ((((unsigned long)(addr) + (64 - 1)) & ~(64 - 1)) - (unsigned long)(addr))
 
-static inline struct sk_buff *big_mac_alloc_skb(unsigned int length, int gfp_flags)
+static inline struct sk_buff *big_mac_alloc_skb(unsigned int length, gfp_t gfp_flags)
 {
        struct sk_buff *skb;