diff options
author | Ingo Molnar <mingo@elte.hu> | 2008-07-10 08:17:14 +0200 |
---|---|---|
committer | Ingo Molnar <mingo@elte.hu> | 2008-07-10 08:17:14 +0200 |
commit | 9e4144abf8a30ae221311368bbb10690ebdb4b76 (patch) | |
tree | 032289d5b7d87976675c1a1a32d512a44d234fa2 /include/rdma | |
parent | e17ba73b0ee6c0f24393c48b455e0d8db761782c (diff) | |
parent | 6329d3021bcfa9038621e6e917d98929421d8ec8 (diff) |
Merge branch 'linus' into core/printk
Conflicts:
kernel/printk.c
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'include/rdma')
-rw-r--r-- | include/rdma/ib_verbs.h | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/include/rdma/ib_verbs.h b/include/rdma/ib_verbs.h index 911a661b727..31d30b1852e 100644 --- a/include/rdma/ib_verbs.h +++ b/include/rdma/ib_verbs.h @@ -105,7 +105,6 @@ enum ib_device_cap_flags { */ IB_DEVICE_UD_IP_CSUM = (1<<18), IB_DEVICE_UD_TSO = (1<<19), - IB_DEVICE_SEND_W_INV = (1<<21), }; enum ib_atomic_cap { |