Merge branch 'linus' into x86/core

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

diff --git a/net/unix/sysctl_net_unix.c b/net/unix/sysctl_net_unix.c
index 77513d7e35f2522251452754deaa4c1b949a2ed3..83c093077ebc845ae89979ff8e0724b99a03f095 100644 (file)
--- a/net/unix/sysctl_net_unix.c
+++ b/net/unix/sysctl_net_unix.c
@@ -21,7 +21,7 @@ static ctl_table unix_table[] = {
                .data           = &init_net.unx.sysctl_max_dgram_qlen,
                .maxlen         = sizeof(int),
                .mode           = 0644,
-               .proc_handler   = &proc_dointvec
+               .proc_handler   = proc_dointvec
        },
        { .ctl_name = 0 }
 };
@@ -61,4 +61,3 @@ void unix_sysctl_unregister(struct net *net)
        unregister_sysctl_table(net->unx.ctl);
        kfree(table);
 }
-