diff options
| author | James Morris <jmorris@namei.org> | 2009-06-08 19:27:53 -0400 |
|---|---|---|
| committer | James Morris <jmorris@namei.org> | 2009-06-08 19:27:53 -0400 |
| commit | 0b4ec6e4e01d98e55ae325a41304cccd87fa4c0f (patch) | |
| tree | 1e075fdf4aaf0c5c003564b3f3414bb4a92ef2ed /drivers/net/cxgb3/adapter.h | |
| parent | 04288f42033607099cebf5ca15ce8dcec3a9688b (diff) | |
| parent | 3af968e066d593bc4dacc021715f3e95ddf0996f (diff) | |
Merge branch 'master' into next
Diffstat (limited to 'drivers/net/cxgb3/adapter.h')
| -rw-r--r-- | drivers/net/cxgb3/adapter.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/net/cxgb3/adapter.h b/drivers/net/cxgb3/adapter.h index 714df2b675e6..c888e97c9671 100644 --- a/drivers/net/cxgb3/adapter.h +++ b/drivers/net/cxgb3/adapter.h | |||
| @@ -85,8 +85,8 @@ struct fl_pg_chunk { | |||
| 85 | struct page *page; | 85 | struct page *page; |
| 86 | void *va; | 86 | void *va; |
| 87 | unsigned int offset; | 87 | unsigned int offset; |
| 88 | u64 *p_cnt; | 88 | unsigned long *p_cnt; |
| 89 | DECLARE_PCI_UNMAP_ADDR(mapping); | 89 | dma_addr_t mapping; |
| 90 | }; | 90 | }; |
| 91 | 91 | ||
| 92 | struct rx_desc; | 92 | struct rx_desc; |