Skip to content

Commit

Permalink
Merge branch 'cma' into for-next
Browse files Browse the repository at this point in the history
  • Loading branch information
Roland Dreier committed Mar 2, 2010
2 parents 17a55f7 + cf4f7e8 commit e8094e6
Showing 1 changed file with 0 additions and 1 deletion.
1 change: 0 additions & 1 deletion include/rdma/rdma_cm.h
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,6 @@ enum rdma_port_space {
RDMA_PS_IPOIB = 0x0002,
RDMA_PS_TCP = 0x0106,
RDMA_PS_UDP = 0x0111,
RDMA_PS_SCTP = 0x0183
};

struct rdma_addr {
Expand Down

0 comments on commit e8094e6

Please sign in to comment.