aboutsummaryrefslogtreecommitdiffstats
path: root/include/linux/fs_enet_pd.h
diff options
context:
space:
mode:
Diffstat (limited to 'include/linux/fs_enet_pd.h')
-rw-r--r--include/linux/fs_enet_pd.h5
1 files changed, 5 insertions, 0 deletions
diff --git a/include/linux/fs_enet_pd.h b/include/linux/fs_enet_pd.h
index 815c6f94378b..9bc045b8c478 100644
--- a/include/linux/fs_enet_pd.h
+++ b/include/linux/fs_enet_pd.h
@@ -120,6 +120,7 @@ struct fs_platform_info {
120 120
121 u32 cp_page; /* CPM page */ 121 u32 cp_page; /* CPM page */
122 u32 cp_block; /* CPM sblock */ 122 u32 cp_block; /* CPM sblock */
123 u32 cp_command; /* CPM page/sblock/mcn */
123 124
124 u32 clk_trx; /* some stuff for pins & mux configuration*/ 125 u32 clk_trx; /* some stuff for pins & mux configuration*/
125 u32 clk_rx; 126 u32 clk_rx;
@@ -134,7 +135,11 @@ struct fs_platform_info {
134 u32 device_flags; 135 u32 device_flags;
135 136
136 int phy_addr; /* the phy address (-1 no phy) */ 137 int phy_addr; /* the phy address (-1 no phy) */
138#ifdef CONFIG_PPC_CPM_NEW_BINDING
139 char bus_id[16];
140#else
137 const char* bus_id; 141 const char* bus_id;
142#endif
138 int phy_irq; /* the phy irq (if it exists) */ 143 int phy_irq; /* the phy irq (if it exists) */
139 144
140 const struct fs_mii_bus_info *bus_info; 145 const struct fs_mii_bus_info *bus_info;