diff options
| author | Ingo Molnar <mingo@elte.hu> | 2010-04-02 13:37:50 -0400 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2010-04-02 13:38:10 -0400 |
| commit | ec5e61aabeac58670691bd0613388d16697d0d81 (patch) | |
| tree | 59838509358f27334874b90756505785cde29b02 /drivers/net/igbvf/igbvf.h | |
| parent | 75ec5a245c7763c397f31ec8964d0a46c54a7386 (diff) | |
| parent | 8bb39f9aa068262732fe44b965d7a6eb5a5a7d67 (diff) | |
Merge branch 'perf/urgent' into perf/core
Conflicts:
arch/x86/kernel/cpu/perf_event.c
Merge reason: Resolve the conflict, pick up fixes
Signed-off-by: Ingo Molnar <mingo@elte.hu>
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 a1774b29d222..debeee2dc717 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 | ||