diff options
| author | Ingo Molnar <mingo@elte.hu> | 2008-07-21 05:02:45 -0400 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2008-07-21 05:02:45 -0400 |
| commit | e27772b48df91a954a74b1411b57d83b945a58c7 (patch) | |
| tree | ebd4a434d9e3cbd0844109e4469f91daac581b59 /drivers/net/sfc/boards.h | |
| parent | d092633bff3b19faffc480fe9810805e7792a029 (diff) | |
| parent | 14b395e35d1afdd8019d11b92e28041fad591b71 (diff) | |
Merge branch 'linus' into x86/urgent
Diffstat (limited to 'drivers/net/sfc/boards.h')
| -rw-r--r-- | drivers/net/sfc/boards.h | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/drivers/net/sfc/boards.h b/drivers/net/sfc/boards.h index 695764dc2e64..e5e844359ce7 100644 --- a/drivers/net/sfc/boards.h +++ b/drivers/net/sfc/boards.h | |||
| @@ -20,8 +20,7 @@ enum efx_board_type { | |||
| 20 | }; | 20 | }; |
| 21 | 21 | ||
| 22 | extern int efx_set_board_info(struct efx_nic *efx, u16 revision_info); | 22 | extern int efx_set_board_info(struct efx_nic *efx, u16 revision_info); |
| 23 | extern int sfe4001_poweron(struct efx_nic *efx); | 23 | extern int sfe4001_init(struct efx_nic *efx); |
| 24 | extern void sfe4001_poweroff(struct efx_nic *efx); | ||
| 25 | /* Are we putting the PHY into flash config mode */ | 24 | /* Are we putting the PHY into flash config mode */ |
| 26 | extern unsigned int sfe4001_phy_flash_cfg; | 25 | extern unsigned int sfe4001_phy_flash_cfg; |
| 27 | 26 | ||