diff options
| author | Andrea Bastoni <bastoni@cs.unc.edu> | 2010-05-30 19:16:45 -0400 |
|---|---|---|
| committer | Andrea Bastoni <bastoni@cs.unc.edu> | 2010-05-30 19:16:45 -0400 |
| commit | ada47b5fe13d89735805b566185f4885f5a3f750 (patch) | |
| tree | 644b88f8a71896307d71438e9b3af49126ffb22b /drivers/net/sh_eth.h | |
| parent | 43e98717ad40a4ae64545b5ba047c7b86aa44f4f (diff) | |
| parent | 3280f21d43ee541f97f8cda5792150d2dbec20d5 (diff) | |
Merge branch 'wip-2.6.34' into old-private-masterarchived-private-master
Diffstat (limited to 'drivers/net/sh_eth.h')
| -rw-r--r-- | drivers/net/sh_eth.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/net/sh_eth.h b/drivers/net/sh_eth.h index ba151f86ae7b..8b47763958f2 100644 --- a/drivers/net/sh_eth.h +++ b/drivers/net/sh_eth.h | |||
| @@ -703,6 +703,7 @@ struct sh_eth_cpu_data { | |||
| 703 | }; | 703 | }; |
| 704 | 704 | ||
| 705 | struct sh_eth_private { | 705 | struct sh_eth_private { |
| 706 | struct platform_device *pdev; | ||
| 706 | struct sh_eth_cpu_data *cd; | 707 | struct sh_eth_cpu_data *cd; |
| 707 | dma_addr_t rx_desc_dma; | 708 | dma_addr_t rx_desc_dma; |
| 708 | dma_addr_t tx_desc_dma; | 709 | dma_addr_t tx_desc_dma; |