Merge branch 'thermal-2.6.33' into release

[mv-sheeva.git] / drivers / scsi / scsi_sysctl.c

diff --git a/drivers/scsi/scsi_sysctl.c b/drivers/scsi/scsi_sysctl.c
index 42c31bee71132e9d6c2b75650373186d583d8c86..2b6b93f7d8efc7bc63da3ca673e061121788e561 100644 (file)
--- a/drivers/scsi/scsi_sysctl.c
+++ b/drivers/scsi/scsi_sysctl.c
@@ -17,7 +17,7 @@ static ctl_table scsi_table[] = {
          .data         = &scsi_logging_level,
          .maxlen       = sizeof(scsi_logging_level),
          .mode         = 0644,
-         .proc_handler = &proc_dointvec },
+         .proc_handler = proc_dointvec },
        { }
 };