Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net

[deliverable/linux.git] / net / ax25 / af_ax25.c

diff --git a/net/ax25/af_ax25.c b/net/ax25/af_ax25.c
index 9d9a6a3edbd58584fdceffdf680de6e28dc72c90..051f7abae66d987177536637c235865258cabbec 100644 (file)
--- a/net/ax25/af_ax25.c
+++ b/net/ax25/af_ax25.c
@@ -1990,7 +1990,6 @@ static int __init ax25_init(void)
        sock_register(&ax25_family_ops);
        dev_add_pack(&ax25_packet_type);
        register_netdevice_notifier(&ax25_dev_notifier);
-       ax25_register_sysctl();
 
        proc_net_fops_create(&init_net, "ax25_route", S_IRUGO, &ax25_route_fops);
        proc_net_fops_create(&init_net, "ax25", S_IRUGO, &ax25_info_fops);
@@ -2013,7 +2012,6 @@ static void __exit ax25_exit(void)
        proc_net_remove(&init_net, "ax25_calls");
 
        unregister_netdevice_notifier(&ax25_dev_notifier);
-       ax25_unregister_sysctl();
 
        dev_remove_pack(&ax25_packet_type);