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/atlx/atl2.h | |
| parent | 43e98717ad40a4ae64545b5ba047c7b86aa44f4f (diff) | |
| parent | 3280f21d43ee541f97f8cda5792150d2dbec20d5 (diff) | |
Merge branch 'wip-2.6.34' into old-private-masterarchived-private-master
Diffstat (limited to 'drivers/net/atlx/atl2.h')
| -rw-r--r-- | drivers/net/atlx/atl2.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/atlx/atl2.h b/drivers/net/atlx/atl2.h index d918bbe621ea..927e4de6474d 100644 --- a/drivers/net/atlx/atl2.h +++ b/drivers/net/atlx/atl2.h | |||
| @@ -442,7 +442,7 @@ struct atl2_hw { | |||
| 442 | struct atl2_ring_header { | 442 | struct atl2_ring_header { |
| 443 | /* pointer to the descriptor ring memory */ | 443 | /* pointer to the descriptor ring memory */ |
| 444 | void *desc; | 444 | void *desc; |
| 445 | /* physical adress of the descriptor ring */ | 445 | /* physical address of the descriptor ring */ |
| 446 | dma_addr_t dma; | 446 | dma_addr_t dma; |
| 447 | /* length of descriptor ring in bytes */ | 447 | /* length of descriptor ring in bytes */ |
| 448 | unsigned int size; | 448 | unsigned int size; |