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/irda/irsysctl.c | |
parent | 48c871c1f6a7c7044dd76774fb469e65c7e2e4e8 (diff) | |
parent | 8a03d9a498eaf02c8a118752050a5154852c13bf (diff) | |
download | blackbird-op-linux-f630fe2817601314b2eb7ca5ddc23c7834646731.tar.gz blackbird-op-linux-f630fe2817601314b2eb7ca5ddc23c7834646731.zip |
Merge branch 'master' into upstream
Diffstat (limited to 'net/irda/irsysctl.c')
-rw-r--r-- | net/irda/irsysctl.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/net/irda/irsysctl.c b/net/irda/irsysctl.c index bb53ba0be585..2e968e7d8fea 100644 --- a/net/irda/irsysctl.c +++ b/net/irda/irsysctl.c @@ -274,7 +274,7 @@ static struct ctl_table_header *irda_table_header; */ int __init irda_sysctl_register(void) { - irda_table_header = register_sysctl_table(irda_root_table, 0); + irda_table_header = register_sysctl_table(irda_root_table); if (!irda_table_header) return -ENOMEM; |