Merge branch 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux

[cascardo/linux.git] / include / linux / stmmac.h

diff --git a/include/linux/stmmac.h b/include/linux/stmmac.h
index b69bdb1..a1547ea 100644 (file)
--- a/include/linux/stmmac.h
+++ b/include/linux/stmmac.h
@@ -76,7 +76,6 @@
 /* Platfrom data for platform device structure's platform_data field */
 
 struct stmmac_mdio_bus_data {
-       int bus_id;
        int (*phy_reset)(void *priv);
        unsigned int phy_mask;
        int *irqs;