diff options
| author | Dave Jones <davej@redhat.com> | 2006-09-05 17:20:21 -0400 |
|---|---|---|
| committer | Dave Jones <davej@redhat.com> | 2006-09-05 17:20:21 -0400 |
| commit | 115b384cf87249d76adb0b21aca11ee22128927d (patch) | |
| tree | f39a2a54863e9d82d1196906f92c82ab5991c6af /drivers/net/spider_net.h | |
| parent | 8eb7925f93af75e66a240d148efdec212f95bcb7 (diff) | |
| parent | c336923b668fdcf0312efbec3b44895d713f4d81 (diff) | |
Merge ../linus
Diffstat (limited to 'drivers/net/spider_net.h')
| -rw-r--r-- | drivers/net/spider_net.h | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/drivers/net/spider_net.h b/drivers/net/spider_net.h index f6dcf180ae3d..30407cdf0892 100644 --- a/drivers/net/spider_net.h +++ b/drivers/net/spider_net.h | |||
| @@ -440,6 +440,9 @@ struct spider_net_card { | |||
| 440 | /* for ethtool */ | 440 | /* for ethtool */ |
| 441 | int msg_enable; | 441 | int msg_enable; |
| 442 | 442 | ||
| 443 | int rx_desc; | ||
| 444 | int tx_desc; | ||
| 445 | |||
| 443 | struct spider_net_descr descr[0]; | 446 | struct spider_net_descr descr[0]; |
| 444 | }; | 447 | }; |
| 445 | 448 | ||