diff options
| author | Steve French <sfrench@us.ibm.com> | 2010-05-13 18:19:32 -0400 |
|---|---|---|
| committer | Steve French <sfrench@us.ibm.com> | 2010-05-13 18:19:32 -0400 |
| commit | baa456331738b4e76a92318b62b354377a30ad80 (patch) | |
| tree | 75c828a7c8a9f1b5f7f41b2e53271eafb7e561ef /drivers/net/sfc/nic.h | |
| parent | aa3e5572c538d753dce11bf93532a75f95d22b40 (diff) | |
| parent | 4462dc02842698f173f518c1f5ce79c0fb89395a (diff) | |
Merge branch 'master' of /pub/scm/linux/kernel/git/torvalds/linux-2.6
Conflicts:
fs/cifs/inode.c
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 9351c0331a47..3166bafdfbef 100644 --- a/drivers/net/sfc/nic.h +++ b/drivers/net/sfc/nic.h | |||
| @@ -156,7 +156,7 @@ extern struct efx_nic_type siena_a0_nic_type; | |||
| 156 | ************************************************************************** | 156 | ************************************************************************** |
| 157 | */ | 157 | */ |
| 158 | 158 | ||
| 159 | extern void falcon_probe_board(struct efx_nic *efx, u16 revision_info); | 159 | extern int falcon_probe_board(struct efx_nic *efx, u16 revision_info); |
| 160 | 160 | ||
| 161 | /* TX data path */ | 161 | /* TX data path */ |
| 162 | extern int efx_nic_probe_tx(struct efx_tx_queue *tx_queue); | 162 | extern int efx_nic_probe_tx(struct efx_tx_queue *tx_queue); |