diff options
author | NeilBrown <neilb@suse.de> | 2012-08-01 06:40:02 -0400 |
---|---|---|
committer | NeilBrown <neilb@suse.de> | 2012-08-01 06:40:02 -0400 |
commit | bb181e2e48f8c85db08c9cb015cbba9618dbf05c (patch) | |
tree | 191bc24dd97bcb174535cc217af082f16da3b43d /net/tipc/netlink.c | |
parent | d57368afe63b3b7b45ce6c2b8c5276417935be2f (diff) | |
parent | c039c332f23e794deb6d6f37b9f07ff3b27fb2cf (diff) |
Merge commit 'c039c332f23e794deb6d6f37b9f07ff3b27fb2cf' into md
Pull in pre-requisites for adding raid10 support to dm-raid.
Diffstat (limited to 'net/tipc/netlink.c')
-rw-r--r-- | net/tipc/netlink.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/net/tipc/netlink.c b/net/tipc/netlink.c index 7bda8e3d1398..47a839df27dc 100644 --- a/net/tipc/netlink.c +++ b/net/tipc/netlink.c | |||
@@ -90,7 +90,7 @@ int tipc_netlink_start(void) | |||
90 | res = genl_register_family_with_ops(&tipc_genl_family, | 90 | res = genl_register_family_with_ops(&tipc_genl_family, |
91 | &tipc_genl_ops, 1); | 91 | &tipc_genl_ops, 1); |
92 | if (res) { | 92 | if (res) { |
93 | err("Failed to register netlink interface\n"); | 93 | pr_err("Failed to register netlink interface\n"); |
94 | return res; | 94 | return res; |
95 | } | 95 | } |
96 | 96 | ||