Merge commit 'origin/master'

[linux-2.6] / drivers / net / sfc / boards.h

diff --git a/drivers/net/sfc/boards.h b/drivers/net/sfc/boards.h
index f56341d428e136bc67b6f665ad444f77055aacfe..e5e844359ce7b058856594da7d4763dc1b4c57ac 100644 (file)
--- a/drivers/net/sfc/boards.h
+++ b/drivers/net/sfc/boards.h
@@ -20,7 +20,8 @@ enum efx_board_type {
 };
 
 extern int efx_set_board_info(struct efx_nic *efx, u16 revision_info);
-extern int sfe4001_poweron(struct efx_nic *efx);
-extern void sfe4001_poweroff(struct efx_nic *efx);
+extern int sfe4001_init(struct efx_nic *efx);
+/* Are we putting the PHY into flash config mode */
+extern unsigned int sfe4001_phy_flash_cfg;
 
 #endif