Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6

[pandora-kernel.git] / include / linux / fs_enet_pd.h

diff --git a/include/linux/fs_enet_pd.h b/include/linux/fs_enet_pd.h
index 543cd3c..8300cab 100644 (file)
--- a/include/linux/fs_enet_pd.h
+++ b/include/linux/fs_enet_pd.h
@@ -16,6 +16,7 @@
 #ifndef FS_ENET_PD_H
 #define FS_ENET_PD_H
 
+#include <linux/string.h>
 #include <asm/types.h>
 
 #define FS_ENET_NAME   "fs_enet"
@@ -102,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 */
 };
@@ -119,6 +116,7 @@ struct fs_platform_info {
 
        u32 cp_page;            /* CPM page */
        u32 cp_block;           /* CPM sblock */
+       u32 cp_command;         /* CPM page/sblock/mcn */
 
        u32 clk_trx;            /* some stuff for pins & mux configuration*/
        u32 clk_rx;
@@ -133,7 +131,7 @@ struct fs_platform_info {
        u32 device_flags;
 
        int phy_addr;           /* the phy address (-1 no phy) */
-       const char*     bus_id;
+       char bus_id[16];
        int phy_irq;            /* the phy irq (if it exists)  */
 
        const struct fs_mii_bus_info *bus_info;