Merge branch 'x86-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel...

[~andy/linux] / net / rose / sysctl_net_rose.c

diff --git a/net/rose/sysctl_net_rose.c b/net/rose/sysctl_net_rose.c
index df6d9dac21865845d88bdc52050a4d0aa6edcf51..94ca9c2ccd692d2a278615221d60abc0ed3037ef 100644 (file)
--- a/net/rose/sysctl_net_rose.c
+++ b/net/rose/sysctl_net_rose.c
@@ -118,18 +118,12 @@ static ctl_table rose_table[] = {
        { }
 };
 
-static struct ctl_path rose_path[] = {
-       { .procname = "net", },
-       { .procname = "rose", },
-       { }
-};
-
 void __init rose_register_sysctl(void)
 {
-       rose_table_header = register_sysctl_paths(rose_path, rose_table);
+       rose_table_header = register_net_sysctl(&init_net, "net/rose", rose_table);
 }
 
 void rose_unregister_sysctl(void)
 {
-       unregister_sysctl_table(rose_table_header);
+       unregister_net_sysctl_table(rose_table_header);
 }