Merge branch 'master' of /usr/src/ntfs-2.6/

1 files changed, 2 insertions, 4 deletions

diff --git a/include/linux/fsl_devices.h b/include/linux/fsl_devices.h
index 934aa9bda481..a9f1cfd096ff 100644
--- a/include/linux/fsl_devices.h
+++ b/include/linux/fsl_devices.h
@@ -50,14 +50,12 @@ struct gianfar_platform_data {
 
         /* board specific information */
         u32 board_flags;
-        const char *bus_id;
+        u32 bus_id;
+        u32 phy_id;
         u8 mac_addr[6];
 };
 
 struct gianfar_mdio_data {
-        /* device specific information */
-        u32 paddr;
-
         /* board specific information */
         int irq[32];
 };