diff options
| author | David S. Miller <davem@davemloft.net> | 2010-05-03 00:43:40 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2010-05-03 01:02:06 -0400 |
| commit | 7ef527377b88ff05fb122a47619ea506c631c914 (patch) | |
| tree | 2c2e774527d5f591b975834f43e8c6fd12fb38f2 /drivers/net/sfc/nic.h | |
| parent | 47d29646a2c1c147d8a7598aeac2c87dd71ed638 (diff) | |
| parent | 1183f3838c588545592c042c0ce15015661ce7f2 (diff) | |
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
Diffstat (limited to 'drivers/net/sfc/nic.h')
| -rw-r--r-- | drivers/net/sfc/nic.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/sfc/nic.h b/drivers/net/sfc/nic.h index 5825f37b51bd..bbc2c0c2f843 100644 --- a/drivers/net/sfc/nic.h +++ b/drivers/net/sfc/nic.h | |||
| @@ -158,7 +158,7 @@ extern struct efx_nic_type siena_a0_nic_type; | |||
| 158 | ************************************************************************** | 158 | ************************************************************************** |
| 159 | */ | 159 | */ |
| 160 | 160 | ||
| 161 | extern void falcon_probe_board(struct efx_nic *efx, u16 revision_info); | 161 | extern int falcon_probe_board(struct efx_nic *efx, u16 revision_info); |
| 162 | 162 | ||
| 163 | /* TX data path */ | 163 | /* TX data path */ |
| 164 | extern int efx_nic_probe_tx(struct efx_tx_queue *tx_queue); | 164 | extern int efx_nic_probe_tx(struct efx_tx_queue *tx_queue); |