projects
/
cascardo
/
linux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'timers/for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git...
[cascardo/linux.git]
/
drivers
/
infiniband
/
hw
/
amso1100
/
c2_rnic.c
diff --git
a/drivers/infiniband/hw/amso1100/c2_rnic.c
b/drivers/infiniband/hw/amso1100/c2_rnic.c
index
b1441ae
..
dd05c48
100644
(file)
--- a/
drivers/infiniband/hw/amso1100/c2_rnic.c
+++ b/
drivers/infiniband/hw/amso1100/c2_rnic.c
@@
-454,7
+454,7
@@
int __devinit c2_rnic_init(struct c2_dev *c2dev)
(IB_DEVICE_RESIZE_MAX_WR |
IB_DEVICE_CURR_QP_STATE_MOD |
IB_DEVICE_SYS_IMAGE_GUID |
- IB_DEVICE_
ZERO_STAG
|
+ IB_DEVICE_
LOCAL_DMA_LKEY
|
IB_DEVICE_MEM_WINDOW);
/* Allocate the qptr_array */