git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input
[pandora-kernel.git]
/
drivers
/
infiniband
/
hw
/
amso1100
/
c2.h
diff --git
a/drivers/infiniband/hw/amso1100/c2.h
b/drivers/infiniband/hw/amso1100/c2.h
index
f7ff66f
..
6ae698e
100644
(file)
--- a/
drivers/infiniband/hw/amso1100/c2.h
+++ b/
drivers/infiniband/hw/amso1100/c2.h
@@
-250,7
+250,7
@@
struct c2_array {
struct sp_chunk {
struct sp_chunk *next;
dma_addr_t dma_addr;
- DE
CLARE_PCI
_UNMAP_ADDR(mapping);
+ DE
FINE_DMA
_UNMAP_ADDR(mapping);
u16 head;
u16 shared_ptr[0];
};