diff options
Diffstat (limited to 'drivers/net/stmmac/stmmac.h')
| -rw-r--r-- | drivers/net/stmmac/stmmac.h | 11 |
1 files changed, 2 insertions, 9 deletions
diff --git a/drivers/net/stmmac/stmmac.h b/drivers/net/stmmac/stmmac.h index 2b076b313622..de1929b2641b 100644 --- a/drivers/net/stmmac/stmmac.h +++ b/drivers/net/stmmac/stmmac.h @@ -20,7 +20,7 @@ Author: Giuseppe Cavallaro <peppe.cavallaro@st.com> *******************************************************************************/ -#define DRV_MODULE_VERSION "Nov_2010" +#define DRV_MODULE_VERSION "July_2011" #include <linux/stmmac.h> #include "common.h" @@ -56,14 +56,9 @@ struct stmmac_priv { struct stmmac_extra_stats xstats; struct napi_struct napi; - phy_interface_t phy_interface; - int phy_addr; - int phy_mask; - int (*phy_reset) (void *priv); int rx_coe; int no_csum_insertion; - int phy_irq; struct phy_device *phydev; int oldlink; int speed; @@ -71,6 +66,7 @@ struct stmmac_priv { unsigned int flow_ctrl; unsigned int pause; struct mii_bus *mii; + int mii_irq[PHY_MAX_ADDR]; u32 msg_enable; spinlock_t lock; @@ -79,9 +75,6 @@ struct stmmac_priv { #ifdef CONFIG_STMMAC_TIMER struct stmmac_timer *tm; #endif -#ifdef STMMAC_VLAN_TAG_USED - struct vlan_group *vlgrp; -#endif struct plat_stmmacenet_data *plat; }; |