[Bluetooth] Disable disconnect timer during Simple Pairing

[linux-2.6-omap-h63xx.git] / net / sysctl_net.c

diff --git a/net/sysctl_net.c b/net/sysctl_net.c
index c50c793aa7f00fa4eeb7184de2b75de323331b84..b4f0525f91af08c4982b9e575b63527344b1c803 100644 (file)
--- a/net/sysctl_net.c
+++ b/net/sysctl_net.c
@@ -30,32 +30,6 @@
 #include <linux/if_tr.h>
 #endif
 
-struct ctl_table net_table[] = {
-       {
-               .ctl_name       = NET_CORE,
-               .procname       = "core",
-               .mode           = 0555,
-               .child          = core_table,
-       },
-#ifdef CONFIG_INET
-       {
-               .ctl_name       = NET_IPV4,
-               .procname       = "ipv4",
-               .mode           = 0555,
-               .child          = ipv4_table
-       },
-#endif
-#ifdef CONFIG_TR
-       {
-               .ctl_name       = NET_TR,
-               .procname       = "token-ring",
-               .mode           = 0555,
-               .child          = tr_table,
-       },
-#endif
-       { 0 },
-};
-
 static struct list_head *
 net_ctl_header_lookup(struct ctl_table_root *root, struct nsproxy *namespaces)
 {
@@ -108,6 +82,6 @@ EXPORT_SYMBOL_GPL(register_net_sysctl_table);
 
 void unregister_net_sysctl_table(struct ctl_table_header *header)
 {
-       return unregister_sysctl_table(header);
+       unregister_sysctl_table(header);
 }
 EXPORT_SYMBOL_GPL(unregister_net_sysctl_table);