Merge branch 'master'

[sfrench/cifs-2.6.git] / include / linux / fsl_devices.h

diff --git a/include/linux/fsl_devices.h b/include/linux/fsl_devices.h
index 70f54af87b9f116f1ffda706c0293f6a7f6a3e24..114d5d59f695bf952837620e4c26e1b024462ca7 100644 (file)
--- a/include/linux/fsl_devices.h
+++ b/include/linux/fsl_devices.h
@@ -47,16 +47,21 @@
 struct gianfar_platform_data {
        /* device specific information */
        u32 device_flags;
-       u32 phy_reg_addr;
 
        /* board specific information */
        u32 board_flags;
-       u32 phy_flags;
-       u32 phyid;
-       u32 interruptPHY;
+       const char *bus_id;
        u8 mac_addr[6];
 };
 
+struct gianfar_mdio_data {
+       /* device specific information */
+       u32 paddr;
+
+       /* board specific information */
+       int irq[32];
+};
+
 /* Flags related to gianfar device features */
 #define FSL_GIANFAR_DEV_HAS_GIGABIT            0x00000001
 #define FSL_GIANFAR_DEV_HAS_COALESCE           0x00000002