Merge branches 'ipoib' and 'odp' into for-next

2015-02-03 09:29:25 -08:00 · 2015-02-03 09:29:25 -08:00 · ecb7b1233c
parent 4143a9515d 7e36ef8205
commit ecb7b1233c
1 changed files with 0 additions and 1 deletions
--- a/drivers/infiniband/core/uverbs_main.c
+++ b/drivers/infiniband/core/uverbs_main.c
@ -123,7 +123,6 @@ static int (*uverbs_ex_cmd_table[])(struct ib_uverbs_file *file,
 				    struct ib_udata *uhw) = {
 	[IB_USER_VERBS_EX_CMD_CREATE_FLOW]	= ib_uverbs_ex_create_flow,
 	[IB_USER_VERBS_EX_CMD_DESTROY_FLOW]	= ib_uverbs_ex_destroy_flow,
-	[IB_USER_VERBS_EX_CMD_QUERY_DEVICE]	= ib_uverbs_ex_query_device
 };

 static void ib_uverbs_add_one(struct ib_device *device);