diff options
| author | Jeff Garzik <jeff@garzik.org> | 2007-02-17 15:11:43 -0500 |
|---|---|---|
| committer | Jeff Garzik <jeff@garzik.org> | 2007-02-17 15:11:43 -0500 |
| commit | f630fe2817601314b2eb7ca5ddc23c7834646731 (patch) | |
| tree | 3bfb4939b7bbc3859575ca8b58fa3f929b015941 /net/x25 | |
| parent | 48c871c1f6a7c7044dd76774fb469e65c7e2e4e8 (diff) | |
| parent | 8a03d9a498eaf02c8a118752050a5154852c13bf (diff) | |
Merge branch 'master' into upstream
Diffstat (limited to 'net/x25')
| -rw-r--r-- | net/x25/sysctl_net_x25.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/net/x25/sysctl_net_x25.c b/net/x25/sysctl_net_x25.c index 5f631061c2..a59b77f182 100644 --- a/net/x25/sysctl_net_x25.c +++ b/net/x25/sysctl_net_x25.c | |||
| @@ -106,7 +106,7 @@ static struct ctl_table x25_root_table[] = { | |||
| 106 | 106 | ||
| 107 | void __init x25_register_sysctl(void) | 107 | void __init x25_register_sysctl(void) |
| 108 | { | 108 | { |
| 109 | x25_table_header = register_sysctl_table(x25_root_table, 1); | 109 | x25_table_header = register_sysctl_table(x25_root_table); |
| 110 | } | 110 | } |
| 111 | 111 | ||
| 112 | void x25_unregister_sysctl(void) | 112 | void x25_unregister_sysctl(void) |