X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=drivers%2Fnet%2Fmacb.h;h=4e3283ebd97cc245dd3b370bb79f8f36da620d6f;hb=afa684f6fda6086b229348f0ea21df7c8ad17964;hp=b3bb2182edd1ce3f9cf1178f18169a51fba926cd;hpb=81b7bbd1932a04869d4c8635a75222dfc6089f96;p=linux-2.6

diff --git a/drivers/net/macb.h b/drivers/net/macb.h
index b3bb2182ed..4e3283ebd9 100644
--- a/drivers/net/macb.h
+++ b/drivers/net/macb.h
@@ -383,11 +383,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 */