diff --git a/[refs] b/[refs]
index 4c91c1f0d9c1..db7e6a95aec6 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: a256be70c57d6f8c827d09d645a1f6fe9330af72
+refs/heads/master: 652c6717465dbd0091dbe04ed9be2f7e59c03c7d
diff --git a/trunk/net/netlink/genetlink.c b/trunk/net/netlink/genetlink.c
index e09e17a90b31..26ed3e8587c2 100644
--- a/trunk/net/netlink/genetlink.c
+++ b/trunk/net/netlink/genetlink.c
@@ -877,11 +877,7 @@ static int __init genl_init(void)
 	for (i = 0; i < GENL_FAM_TAB_SIZE; i++)
 		INIT_LIST_HEAD(&family_ht[i]);
 
-	err = genl_register_family(&genl_ctrl);
-	if (err < 0)
-		goto problem;
-
-	err = genl_register_ops(&genl_ctrl, &genl_ctrl_ops);
+	err = genl_register_family_with_ops(&genl_ctrl, &genl_ctrl_ops, 1);
 	if (err < 0)
 		goto problem;