summaryrefslogtreecommitdiff
path: root/net/dccp/sysctl.c
diff options
context:
space:
mode:
authorJeff Garzik <jeff@garzik.org>2007-02-17 23:11:43 +0300
committerJeff Garzik <jeff@garzik.org>2007-02-17 23:11:43 +0300
commitf630fe2817601314b2eb7ca5ddc23c7834646731 (patch)
tree3bfb4939b7bbc3859575ca8b58fa3f929b015941 /net/dccp/sysctl.c
parent48c871c1f6a7c7044dd76774fb469e65c7e2e4e8 (diff)
parent8a03d9a498eaf02c8a118752050a5154852c13bf (diff)
downloadlinux-f630fe2817601314b2eb7ca5ddc23c7834646731.tar.xz
Merge branch 'master' into upstream
Diffstat (limited to 'net/dccp/sysctl.c')
-rw-r--r--net/dccp/sysctl.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/net/dccp/sysctl.c b/net/dccp/sysctl.c
index fdcfca3e9208..1260aabac5e1 100644
--- a/net/dccp/sysctl.c
+++ b/net/dccp/sysctl.c
@@ -127,7 +127,7 @@ static struct ctl_table_header *dccp_table_header;
int __init dccp_sysctl_init(void)
{
- dccp_table_header = register_sysctl_table(dccp_root_table, 1);
+ dccp_table_header = register_sysctl_table(dccp_root_table);
return dccp_table_header != NULL ? 0 : -ENOMEM;
}