Merge commit 'v2.6.32-rc7'

[safe/jmp/linux-2.6] / net / ipx / sysctl_net_ipx.c

diff --git a/net/ipx/sysctl_net_ipx.c b/net/ipx/sysctl_net_ipx.c
index 633fcab..bd6dca0 100644 (file)
--- a/net/ipx/sysctl_net_ipx.c
+++ b/net/ipx/sysctl_net_ipx.c
@@ -18,19 +18,18 @@ extern int sysctl_ipx_pprop_broadcasting;
 
 static struct ctl_table ipx_table[] = {
        {
-               .ctl_name       = NET_IPX_PPROP_BROADCASTING,
                .procname       = "ipx_pprop_broadcasting",
                .data           = &sysctl_ipx_pprop_broadcasting,
                .maxlen         = sizeof(int),
                .mode           = 0644,
                .proc_handler   = proc_dointvec,
        },
-       { 0 },
+       { },
 };
 
 static struct ctl_path ipx_path[] = {
-       { .procname = "net", .ctl_name = CTL_NET, },
-       { .procname = "ipx", .ctl_name = NET_IPX, },
+       { .procname = "net", },
+       { .procname = "ipx", },
        { }
 };