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.c | |
| parent | d092633bff3b19faffc480fe9810805e7792a029 (diff) | |
| parent | 14b395e35d1afdd8019d11b92e28041fad591b71 (diff) | |
Merge branch 'linus' into x86/urgent
Diffstat (limited to 'drivers/net/sfc/boards.c')
| -rw-r--r-- | drivers/net/sfc/boards.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/sfc/boards.c b/drivers/net/sfc/boards.c index 7fc0328dc055..d3d3dd0a1170 100644 --- a/drivers/net/sfc/boards.c +++ b/drivers/net/sfc/boards.c | |||
| @@ -109,7 +109,7 @@ static struct efx_board_data board_data[] = { | |||
| 109 | [EFX_BOARD_INVALID] = | 109 | [EFX_BOARD_INVALID] = |
| 110 | {NULL, NULL, dummy_init}, | 110 | {NULL, NULL, dummy_init}, |
| 111 | [EFX_BOARD_SFE4001] = | 111 | [EFX_BOARD_SFE4001] = |
| 112 | {"SFE4001", "10GBASE-T adapter", sfe4001_poweron}, | 112 | {"SFE4001", "10GBASE-T adapter", sfe4001_init}, |
| 113 | [EFX_BOARD_SFE4002] = | 113 | [EFX_BOARD_SFE4002] = |
| 114 | {"SFE4002", "XFP adapter", sfe4002_init}, | 114 | {"SFE4002", "XFP adapter", sfe4002_init}, |
| 115 | }; | 115 | }; |