Merge branch 'upstream-linus' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik...

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

diff --git a/net/ipx/sysctl_net_ipx.c b/net/ipx/sysctl_net_ipx.c
index 510eda96d10aa2d3480519474c6c0eddf0cff1e7..0cf52645053648c7444a86544537a2b54a0243a1 100644 (file)
--- a/net/ipx/sysctl_net_ipx.c
+++ b/net/ipx/sysctl_net_ipx.c
@@ -6,7 +6,6 @@
  * Added /proc/sys/net/ipx/ipx_pprop_broadcasting - acme March 4, 2001
  */
 
-#include <linux/config.h>
 #include <linux/mm.h>
 #include <linux/sysctl.h>
 
@@ -35,7 +34,7 @@ static struct ctl_table ipx_dir_table[] = {
                .procname       = "ipx",
                .mode           = 0555,
                .child          = ipx_table,
-               },
+       },
        { 0 },
 };
 
@@ -53,7 +52,7 @@ static struct ctl_table_header *ipx_table_header;
 
 void ipx_register_sysctl(void)
 {
-       ipx_table_header = register_sysctl_table(ipx_root_table, 1);
+       ipx_table_header = register_sysctl_table(ipx_root_table);
 }
 
 void ipx_unregister_sysctl(void)