diff options
| author | Steve French <sfrench@us.ibm.com> | 2005-09-06 18:47:31 -0400 |
|---|---|---|
| committer | Steve French <sfrench@us.ibm.com> | 2005-09-06 18:47:31 -0400 |
| commit | c08319a9d50b5c9cb4fdb33728bd16497cf4ddd3 (patch) | |
| tree | 5fbec9030029da1ec387c18b85f26f19ee50da44 /drivers/net/sungem.h | |
| parent | bfa0d75a1eee59f0577e3c1697ff570b77581a35 (diff) | |
| parent | 4706df3d3c42af802597d82c8b1542c3d52eab23 (diff) | |
Merge with /pub/scm/linux/kernel/git/torvalds/linux-2.6.git
Diffstat (limited to 'drivers/net/sungem.h')
| -rw-r--r-- | drivers/net/sungem.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/sungem.h b/drivers/net/sungem.h index 7143fd7cf3f8..ff8ae5f79970 100644 --- a/drivers/net/sungem.h +++ b/drivers/net/sungem.h | |||
| @@ -1020,7 +1020,7 @@ struct gem { | |||
| 1020 | 1020 | ||
| 1021 | struct gem_init_block *init_block; | 1021 | struct gem_init_block *init_block; |
| 1022 | struct sk_buff *rx_skbs[RX_RING_SIZE]; | 1022 | struct sk_buff *rx_skbs[RX_RING_SIZE]; |
| 1023 | struct sk_buff *tx_skbs[RX_RING_SIZE]; | 1023 | struct sk_buff *tx_skbs[TX_RING_SIZE]; |
| 1024 | dma_addr_t gblock_dvma; | 1024 | dma_addr_t gblock_dvma; |
| 1025 | 1025 | ||
| 1026 | struct pci_dev *pdev; | 1026 | struct pci_dev *pdev; |