Merge branch 'for-linus' of git://oss.sgi.com/xfs/xfs

[firefly-linux-kernel-4.4.55.git] / include / linux / fs_enet_pd.h

diff --git a/include/linux/fs_enet_pd.h b/include/linux/fs_enet_pd.h
index 8300cab30f9a7c2f5e4fafea7a5fa2955bee1934..51b793466ff3adcadb4e6bcc0d372494dbf7440c 100644 (file)
--- a/include/linux/fs_enet_pd.h
+++ b/include/linux/fs_enet_pd.h
@@ -17,6 +17,7 @@
 #define FS_ENET_PD_H
 
 #include <linux/string.h>
+#include <linux/of_mdio.h>
 #include <asm/types.h>
 
 #define FS_ENET_NAME   "fs_enet"
@@ -130,10 +131,7 @@ struct fs_platform_info {
        
        u32 device_flags;
 
-       int phy_addr;           /* the phy address (-1 no phy) */
-       char bus_id[16];
-       int phy_irq;            /* the phy irq (if it exists)  */
-
+       struct device_node *phy_node;
        const struct fs_mii_bus_info *bus_info;
 
        int rx_ring, tx_ring;   /* number of buffers on rx     */