Merge branch 'cma' into for-next

2010-03-01 23:51:54 -08:00 · 2010-03-01 23:51:54 -08:00 · e8094e667a
parent 17a55f79fd cf4f7e8c47
commit e8094e667a
1 changed files with 0 additions and 1 deletions
--- a/include/rdma/rdma_cm.h
+++ b/include/rdma/rdma_cm.h
@ -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 {