Pull misc-for-upstream into release branch

[linux-2.6] / drivers / scsi / scsi_sysctl.c

diff --git a/drivers/scsi/scsi_sysctl.c b/drivers/scsi/scsi_sysctl.c
index 04d06c25132b39076648429077614efc9879c1c1..6cfaaa2d0c819a1478f4b31a80503a24db71f652 100644 (file)
--- a/drivers/scsi/scsi_sysctl.c
+++ b/drivers/scsi/scsi_sysctl.c
@@ -41,7 +41,7 @@ static struct ctl_table_header *scsi_table_header;
 
 int __init scsi_init_sysctl(void)
 {
-       scsi_table_header = register_sysctl_table(scsi_root_table, 1);
+       scsi_table_header = register_sysctl_table(scsi_root_table);
        if (!scsi_table_header)
                return -ENOMEM;
        return 0;