diff options
| author | Paul Mackerras <paulus@samba.org> | 2006-03-08 22:32:05 -0500 |
|---|---|---|
| committer | Paul Mackerras <paulus@samba.org> | 2006-03-08 22:32:05 -0500 |
| commit | 516450179454de9e689e0a53ed8f34b896e8651c (patch) | |
| tree | 78eae2f77de6cd39b18c7393fc5854456fc3fb1f /drivers/net/e1000/e1000.h | |
| parent | 6749c5507388f3fc3719f57a54b540ee83f6661a (diff) | |
| parent | 0d514f040ac6629311974889d5b96bcf21c6461a (diff) | |
Merge ../linux-2.6
Diffstat (limited to 'drivers/net/e1000/e1000.h')
| -rw-r--r-- | drivers/net/e1000/e1000.h | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/drivers/net/e1000/e1000.h b/drivers/net/e1000/e1000.h index 27c77306193b..99baf0e099fc 100644 --- a/drivers/net/e1000/e1000.h +++ b/drivers/net/e1000/e1000.h | |||
| @@ -225,9 +225,6 @@ struct e1000_rx_ring { | |||
| 225 | struct e1000_ps_page *ps_page; | 225 | struct e1000_ps_page *ps_page; |
| 226 | struct e1000_ps_page_dma *ps_page_dma; | 226 | struct e1000_ps_page_dma *ps_page_dma; |
| 227 | 227 | ||
| 228 | struct sk_buff *rx_skb_top; | ||
| 229 | struct sk_buff *rx_skb_prev; | ||
| 230 | |||
| 231 | /* cpu for rx queue */ | 228 | /* cpu for rx queue */ |
| 232 | int cpu; | 229 | int cpu; |
| 233 | 230 | ||