git.samba.org
/
sfrench
/
cifs-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'linus' into irq/numa
[sfrench/cifs-2.6.git]
/
drivers
/
net
/
cxgb3
/
adapter.h
diff --git
a/drivers/net/cxgb3/adapter.h
b/drivers/net/cxgb3/adapter.h
index 714df2b675e6b27f88009c013c54dfdedb674c7a..c888e97c9671b0cef29f3e698f454b94830b5473 100644
(file)
--- 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;
- u
64
*p_cnt;
-
DECLARE_PCI_UNMAP_ADDR(mapping)
;
+ u
nsigned long
*p_cnt;
+
dma_addr_t mapping
;
};
struct rx_desc;