diff options
| author | David S. Miller <davem@davemloft.net> | 2010-04-07 02:53:30 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2010-04-07 02:53:30 -0400 |
| commit | 4a35ecf8bf1c4b039503fa554100fe85c761de76 (patch) | |
| tree | 9b75f5d5636004d9a9aa496924377379be09aa1f /drivers/net/igb/igb.h | |
| parent | b4d562e3c3553ac58c7120555c4e4aefbb090a2a (diff) | |
| parent | fb9e2d887243499b8d28efcf80821c4f6a092395 (diff) | |
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
Conflicts:
drivers/net/bonding/bond_main.c
drivers/net/via-velocity.c
drivers/net/wireless/iwlwifi/iwl-agn.c
Diffstat (limited to 'drivers/net/igb/igb.h')
| -rw-r--r-- | drivers/net/igb/igb.h | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/drivers/net/igb/igb.h b/drivers/net/igb/igb.h index 4f69b6d951b..7d288ccca1c 100644 --- a/drivers/net/igb/igb.h +++ b/drivers/net/igb/igb.h | |||
| @@ -268,7 +268,6 @@ struct igb_adapter { | |||
| 268 | 268 | ||
| 269 | /* TX */ | 269 | /* TX */ |
| 270 | struct igb_ring *tx_ring[16]; | 270 | struct igb_ring *tx_ring[16]; |
| 271 | unsigned long tx_queue_len; | ||
| 272 | u32 tx_timeout_count; | 271 | u32 tx_timeout_count; |
| 273 | 272 | ||
| 274 | /* RX */ | 273 | /* RX */ |