Merge branch 'linus' into x86/signal

[pandora-kernel.git] / drivers / net / macb.h

diff --git a/drivers/net/macb.h b/drivers/net/macb.h
index b3bb218..d3212f6 100644 (file)
--- a/drivers/net/macb.h
+++ b/drivers/net/macb.h
@@ -374,6 +374,7 @@ struct macb {
        struct clk              *pclk;
        struct clk              *hclk;
        struct net_device       *dev;
+       struct napi_struct      napi;
        struct net_device_stats stats;
        struct macb_stats       hw_stats;
 
@@ -383,11 +384,11 @@ struct macb {
 
        unsigned int            rx_pending, tx_pending;
 
-       struct delayed_work     periodic_task;
-
-       struct mutex            mdio_mutex;
-       struct completion       mdio_complete;
-       struct mii_if_info      mii;
+       struct mii_bus          *mii_bus;
+       struct phy_device       *phy_dev;
+       unsigned int            link;
+       unsigned int            speed;
+       unsigned int            duplex;
 };
 
 #endif /* _MACB_H */