diff options
| author | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2008-07-21 04:55:14 (GMT) |
|---|---|---|
| committer | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2008-07-21 04:55:14 (GMT) |
| commit | 908cf4b925e419bc74f3297b2f0e51d6f8a81da2 (patch) | |
| tree | 6c2da79366d4695a9c2560ab18259eca8a2a25b4 /drivers/net/sfc/boards.h | |
| parent | 92c49890922d54cba4b1eadeb0b185773c2c9570 (diff) | |
| parent | 14b395e35d1afdd8019d11b92e28041fad591b71 (diff) | |
| download | linux-fsl-qoriq-908cf4b925e419bc74f3297b2f0e51d6f8a81da2.tar.xz | |
Merge master.kernel.org:/pub/scm/linux/kernel/git/torvalds/linux-2.6 into next
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 695764d..e5e8443 100644 --- a/drivers/net/sfc/boards.h +++ b/drivers/net/sfc/boards.h @@ -20,8 +20,7 @@ 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; |