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/ipx | |
| parent | 48c871c1f6a7c7044dd76774fb469e65c7e2e4e8 (diff) | |
| parent | 8a03d9a498eaf02c8a118752050a5154852c13bf (diff) | |
Merge branch 'master' into upstream
Diffstat (limited to 'net/ipx')
| -rw-r--r-- | net/ipx/sysctl_net_ipx.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/net/ipx/sysctl_net_ipx.c b/net/ipx/sysctl_net_ipx.c index 85ae35fa1e..0cf5264505 100644 --- a/net/ipx/sysctl_net_ipx.c +++ b/net/ipx/sysctl_net_ipx.c | |||
| @@ -52,7 +52,7 @@ static struct ctl_table_header *ipx_table_header; | |||
| 52 | 52 | ||
| 53 | void ipx_register_sysctl(void) | 53 | void ipx_register_sysctl(void) |
| 54 | { | 54 | { |
| 55 | ipx_table_header = register_sysctl_table(ipx_root_table, 1); | 55 | ipx_table_header = register_sysctl_table(ipx_root_table); |
| 56 | } | 56 | } |
| 57 | 57 | ||
| 58 | void ipx_unregister_sysctl(void) | 58 | void ipx_unregister_sysctl(void) |