diff options
| author | David S. Miller <davem@davemloft.net> | 2009-06-03 02:43:41 -0700 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2009-06-03 02:43:41 -0700 |
| commit | b2f8f7525c8aa1fdd8ad8c72c832dfb571d5f768 (patch) | |
| tree | 71ae1801d264bca62efa0d22376b49de7f206e9a /drivers/net/cxgb3/adapter.h | |
| parent | d455e5b165a367a628110ec2d18807ea10052cd1 (diff) | |
| parent | 12186be7d2e1106cede1cc728526e3d7998cbe94 (diff) | |
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
Conflicts:
drivers/net/forcedeth.c
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 322434ac42fc..e48e508b9632 100644 --- a/drivers/net/cxgb3/adapter.h +++ b/drivers/net/cxgb3/adapter.h @@ -85,8 +85,8 @@ struct fl_pg_chunk { struct page *page; void *va; unsigned int offset; - u64 *p_cnt; - DECLARE_PCI_UNMAP_ADDR(mapping); + unsigned long *p_cnt; + dma_addr_t mapping; }; struct rx_desc; |