Merge master.kernel.org:/pub/scm/linux/kernel/git/jejb/scsi-misc-2.6

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

diff --git a/net/ipv6/sysctl_net_ipv6.c b/net/ipv6/sysctl_net_ipv6.c
index 8eff9fa1e983312b38926e1d5e3286d7474f84b6..3fb44277207be3c8b318f93a1aa8d59e42227b1a 100644 (file)
--- a/net/ipv6/sysctl_net_ipv6.c
+++ b/net/ipv6/sysctl_net_ipv6.c
@@ -7,7 +7,6 @@
 
 #include <linux/mm.h>
 #include <linux/sysctl.h>
-#include <linux/config.h>
 #include <linux/in6.h>
 #include <linux/ipv6.h>
 #include <net/ndisc.h>
@@ -93,7 +92,7 @@ static ctl_table ipv6_net_table[] = {
                .mode           = 0555,
                .child          = ipv6_table
        },
-        { .ctl_name = 0 }
+       { .ctl_name = 0 }
 };
 
 static ctl_table ipv6_root_table[] = {
@@ -103,12 +102,12 @@ static ctl_table ipv6_root_table[] = {
                .mode           = 0555,
                .child          = ipv6_net_table
        },
-        { .ctl_name = 0 }
+       { .ctl_name = 0 }
 };
 
 void ipv6_sysctl_register(void)
 {
-       ipv6_sysctl_header = register_sysctl_table(ipv6_root_table, 0);
+       ipv6_sysctl_header = register_sysctl_table(ipv6_root_table);
 }
 
 void ipv6_sysctl_unregister(void)