Merge branch 'drm-intel-fixes' of git://people.freedesktop.org/~danvet/drm-intel...

[karo-tx-linux.git] / net / x25 / sysctl_net_x25.c

diff --git a/net/x25/sysctl_net_x25.c b/net/x25/sysctl_net_x25.c
index d2efd29f434ee8fa329b5d6528e6a0cc024e58fd..43239527a2058007242bd32ae4bf1891f6622252 100644 (file)
--- a/net/x25/sysctl_net_x25.c
+++ b/net/x25/sysctl_net_x25.c
@@ -73,18 +73,12 @@ static struct ctl_table x25_table[] = {
        { 0, },
 };
 
-static struct ctl_path x25_path[] = {
-       { .procname = "net", },
-       { .procname = "x25", },
-       { }
-};
-
 void __init x25_register_sysctl(void)
 {
-       x25_table_header = register_sysctl_paths(x25_path, x25_table);
+       x25_table_header = register_net_sysctl(&init_net, "net/x25", x25_table);
 }
 
 void x25_unregister_sysctl(void)
 {
-       unregister_sysctl_table(x25_table_header);
+       unregister_net_sysctl_table(x25_table_header);
 }