diff options
| author | Ingo Molnar <mingo@elte.hu> | 2009-10-13 03:24:51 -0400 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2009-10-13 03:24:59 -0400 |
| commit | 2c96c142e941041973faab20ca3b82d57f435c5e (patch) | |
| tree | 45188f0ecb3f4bb7408a7219f8fcd041d500235a /drivers/net/tg3.h | |
| parent | 3c355863fb32070a2800f41106519c5c3038623a (diff) | |
| parent | 8ad807318fcd62aba0e18c7c7fbfcc1af3fcdbab (diff) | |
Merge branch 'tracing/urgent' into tracing/core
Merge reason: Pick up tracing/filters fix from the urgent queue,
we will queue up dependent patches.
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'drivers/net/tg3.h')
| -rw-r--r-- | drivers/net/tg3.h | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/drivers/net/tg3.h b/drivers/net/tg3.h index 82b45d8797b4..524691cd9896 100644 --- a/drivers/net/tg3.h +++ b/drivers/net/tg3.h | |||
| @@ -2412,7 +2412,6 @@ struct ring_info { | |||
| 2412 | 2412 | ||
| 2413 | struct tx_ring_info { | 2413 | struct tx_ring_info { |
| 2414 | struct sk_buff *skb; | 2414 | struct sk_buff *skb; |
| 2415 | u32 prev_vlan_tag; | ||
| 2416 | }; | 2415 | }; |
| 2417 | 2416 | ||
| 2418 | struct tg3_config_info { | 2417 | struct tg3_config_info { |