diff options
| author | Dave Airlie <airlied@redhat.com> | 2010-08-01 20:05:18 -0400 |
|---|---|---|
| committer | Dave Airlie <airlied@redhat.com> | 2010-08-01 20:05:24 -0400 |
| commit | d656ae53f64cb0f01dac8a02c4d31453d64ef97c (patch) | |
| tree | cf641d4e5828b8f7c430b42657237c5daf9571fd /drivers/net/s2io.h | |
| parent | 167ffc44caaee68ea60dadf6931a4d195a4ed1f0 (diff) | |
| parent | b37fa16e78d6f9790462b3181602a26b5af36260 (diff) | |
Merge tag 'v2.6.35-rc6' into drm-radeon-next
Need this to avoid conflicts with future radeon fixes
Diffstat (limited to 'drivers/net/s2io.h')
| -rw-r--r-- | drivers/net/s2io.h | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/drivers/net/s2io.h b/drivers/net/s2io.h index 47c36e0994f..5e52c75892d 100644 --- a/drivers/net/s2io.h +++ b/drivers/net/s2io.h | |||
| @@ -745,10 +745,6 @@ struct ring_info { | |||
| 745 | 745 | ||
| 746 | /* Buffer Address store. */ | 746 | /* Buffer Address store. */ |
| 747 | struct buffAdd **ba; | 747 | struct buffAdd **ba; |
| 748 | |||
| 749 | /* per-Ring statistics */ | ||
| 750 | unsigned long rx_packets; | ||
| 751 | unsigned long rx_bytes; | ||
| 752 | } ____cacheline_aligned; | 748 | } ____cacheline_aligned; |
| 753 | 749 | ||
| 754 | /* Fifo specific structure */ | 750 | /* Fifo specific structure */ |