Linux 2.6.28-rc1

[linux-2.6-omap-h63xx.git] / drivers / net / tg3.h

diff --git a/drivers/net/tg3.h b/drivers/net/tg3.h
index f5b8cab8d4b5c2d4f227be04c87ef60e2f7b70cb..be252abe8985faf0fb2d7c75bec2d10095ef4f7c 100644 (file)
--- a/drivers/net/tg3.h
+++ b/drivers/net/tg3.h
@@ -2197,7 +2197,6 @@ struct ring_info {
 
 struct tx_ring_info {
        struct sk_buff                  *skb;
-       DECLARE_PCI_UNMAP_ADDR(mapping)
        u32                             prev_vlan_tag;
 };
 
@@ -2557,7 +2556,7 @@ struct tg3 {
        int                             msi_cap;
        int                             pcix_cap;
 
-       struct mii_bus                  mdio_bus;
+       struct mii_bus                  *mdio_bus;
        int                             mdio_irq[PHY_MAX_ADDR];
 
        /* PHY info */