Force erroneous inclusions of compiler-*.h files to be errors

[linux-2.6-omap-h63xx.git] / include / linux / fs_enet_pd.h

diff --git a/include/linux/fs_enet_pd.h b/include/linux/fs_enet_pd.h
index 815c6f94378bd66ca2dfca733d1d309a16fc1af4..9bc045b8c4789a3c621d2eaf4251801796a78d42 100644 (file)
--- a/include/linux/fs_enet_pd.h
+++ b/include/linux/fs_enet_pd.h
@@ -120,6 +120,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;
@@ -134,7 +135,11 @@ struct fs_platform_info {
        u32 device_flags;
 
        int phy_addr;           /* the phy address (-1 no phy) */
+#ifdef CONFIG_PPC_CPM_NEW_BINDING
+       char bus_id[16];
+#else
        const char*     bus_id;
+#endif
        int phy_irq;            /* the phy irq (if it exists)  */
 
        const struct fs_mii_bus_info *bus_info;