diff options
| author | David S. Miller <davem@davemloft.net> | 2009-09-02 03:32:56 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2009-09-02 03:32:56 -0400 |
| commit | 6cdee2f96a97f6da26bd3759c3f8823332fbb438 (patch) | |
| tree | ec79086f05ffc3bdf1aecc37e108ccfc3a95450d /drivers/net/bnx2.h | |
| parent | 0625491493d9000e4556bf566d205c28c8e7dc4e (diff) | |
| parent | 2fbd3da3877ad8d923b055e5996f80b4d4a6daf4 (diff) | |
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
Conflicts:
drivers/net/yellowfin.c
Diffstat (limited to 'drivers/net/bnx2.h')
| -rw-r--r-- | drivers/net/bnx2.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/net/bnx2.h b/drivers/net/bnx2.h index 7544188b6541..6c7f795d12de 100644 --- a/drivers/net/bnx2.h +++ b/drivers/net/bnx2.h | |||
| @@ -6903,6 +6903,7 @@ struct bnx2 { | |||
| 6903 | u32 idle_chk_status_idx; | 6903 | u32 idle_chk_status_idx; |
| 6904 | 6904 | ||
| 6905 | #ifdef BCM_CNIC | 6905 | #ifdef BCM_CNIC |
| 6906 | struct mutex cnic_lock; | ||
| 6906 | struct cnic_eth_dev cnic_eth_dev; | 6907 | struct cnic_eth_dev cnic_eth_dev; |
| 6907 | #endif | 6908 | #endif |
| 6908 | 6909 | ||