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

ecb7b123 · Roland Dreier · 4143a951 · 7e36ef82 · ecb7b123
Commit ecb7b123 authored Feb 03, 2015 by Roland Dreier
Hide whitespace changes
Inline Side-by-side

Showing with 0 additions and 1 deletion

drivers/infiniband/core/uverbs_main.c drivers/infiniband/core/uverbs_main.c +0 -1

No files found.
--- 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);