Merge branch 'upstream-davem' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/netdev-2.6

1 files changed, 0 insertions, 4 deletions

diff --git a/include/linux/fs_enet_pd.h b/include/linux/fs_enet_pd.h
index 9bc045b8c478..decc4b56ccf9 100644
--- a/include/linux/fs_enet_pd.h
+++ b/include/linux/fs_enet_pd.h
@@ -103,10 +103,6 @@ struct fs_mii_bb_platform_info {
         struct fs_mii_bit       mdio_dir;
         struct fs_mii_bit       mdio_dat;
         struct fs_mii_bit       mdc_dat;
-        int mdio_port;  /* port & bit for MDIO */
-        int mdio_bit;
-        int mdc_port;   /* port & bit for MDC  */
-        int mdc_bit;
         int delay;      /* delay in us         */
         int irq[32];    /* irqs per phy's */
 };