diff options
| author | Trond Myklebust <Trond.Myklebust@netapp.com> | 2006-06-25 06:44:44 -0400 |
|---|---|---|
| committer | Trond Myklebust <Trond.Myklebust@netapp.com> | 2006-06-25 06:44:44 -0400 |
| commit | 76a9f26c9e40e9c0ed5dc8f0cedd74e733f0088d (patch) | |
| tree | 8e2db4ba9263e92d264ef469c7dac28078f63874 /drivers/net/sunbmac.h | |
| parent | 9bf2aa129a107a0e9e2a5318d35aca731ae7e666 (diff) | |
| parent | dfd8317d3340f03bc06eba6b58f0ec0861da4a13 (diff) | |
Merge branch 'master' of /home/trondmy/kernel/linux-2.6/
Diffstat (limited to 'drivers/net/sunbmac.h')
| -rw-r--r-- | drivers/net/sunbmac.h | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/drivers/net/sunbmac.h b/drivers/net/sunbmac.h index b0dbc5187143..b563d3c2993e 100644 --- a/drivers/net/sunbmac.h +++ b/drivers/net/sunbmac.h | |||
| @@ -332,7 +332,6 @@ struct bigmac { | |||
| 332 | struct sbus_dev *qec_sdev; | 332 | struct sbus_dev *qec_sdev; |
| 333 | struct sbus_dev *bigmac_sdev; | 333 | struct sbus_dev *bigmac_sdev; |
| 334 | struct net_device *dev; | 334 | struct net_device *dev; |
| 335 | struct bigmac *next_module; | ||
| 336 | }; | 335 | }; |
| 337 | 336 | ||
| 338 | /* We use this to acquire receive skb's that we can DMA directly into. */ | 337 | /* We use this to acquire receive skb's that we can DMA directly into. */ |