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/llc | |
| parent | 48c871c1f6a7c7044dd76774fb469e65c7e2e4e8 (diff) | |
| parent | 8a03d9a498eaf02c8a118752050a5154852c13bf (diff) | |
Merge branch 'master' into upstream
Diffstat (limited to 'net/llc')
| -rw-r--r-- | net/llc/sysctl_net_llc.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/net/llc/sysctl_net_llc.c b/net/llc/sysctl_net_llc.c index d047a3e157..46992d0360 100644 --- a/net/llc/sysctl_net_llc.c +++ b/net/llc/sysctl_net_llc.c | |||
| @@ -116,7 +116,7 @@ static struct ctl_table_header *llc_table_header; | |||
| 116 | 116 | ||
| 117 | int __init llc_sysctl_init(void) | 117 | int __init llc_sysctl_init(void) |
| 118 | { | 118 | { |
| 119 | llc_table_header = register_sysctl_table(llc_root_table, 1); | 119 | llc_table_header = register_sysctl_table(llc_root_table); |
| 120 | 120 | ||
| 121 | return llc_table_header ? 0 : -ENOMEM; | 121 | return llc_table_header ? 0 : -ENOMEM; |
| 122 | } | 122 | } |