diff options
| author | David Woodhouse <David.Woodhouse@intel.com> | 2010-05-10 09:32:46 -0400 |
|---|---|---|
| committer | David Woodhouse <David.Woodhouse@intel.com> | 2010-05-10 09:32:46 -0400 |
| commit | 0ae28a35bcb7984838acbf28bfba9c030f8b74f0 (patch) | |
| tree | 4f449d929b5df9e126e839f388ff0fd2b52028a0 /drivers/net/igbvf/igbvf.h | |
| parent | 6f1f3d0ab5c3eeea9f04486481c25e9afdfa26c5 (diff) | |
| parent | b57f95a38233a2e73b679bea4a5453a1cc2a1cc9 (diff) | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
Conflicts:
drivers/mtd/mtdcore.c
Pull in the bdi fixes and ARM platform changes that other outstanding
patches depend on.
Diffstat (limited to 'drivers/net/igbvf/igbvf.h')
| -rw-r--r-- | drivers/net/igbvf/igbvf.h | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/drivers/net/igbvf/igbvf.h b/drivers/net/igbvf/igbvf.h index a1774b29d22..debeee2dc71 100644 --- a/drivers/net/igbvf/igbvf.h +++ b/drivers/net/igbvf/igbvf.h | |||
| @@ -198,7 +198,6 @@ struct igbvf_adapter { | |||
| 198 | struct igbvf_ring *tx_ring /* One per active queue */ | 198 | struct igbvf_ring *tx_ring /* One per active queue */ |
| 199 | ____cacheline_aligned_in_smp; | 199 | ____cacheline_aligned_in_smp; |
| 200 | 200 | ||
| 201 | unsigned long tx_queue_len; | ||
| 202 | unsigned int restart_queue; | 201 | unsigned int restart_queue; |
| 203 | u32 txd_cmd; | 202 | u32 txd_cmd; |
| 204 | 203 | ||