diff options
| author | James Bottomley <JBottomley@Parallels.com> | 2014-12-18 08:56:29 -0500 |
|---|---|---|
| committer | James Bottomley <JBottomley@Parallels.com> | 2014-12-18 08:56:29 -0500 |
| commit | e61745769125a3c788e7aceb2a5fb680ebb461e6 (patch) | |
| tree | c8219c31767c8d6a64938626dd93069847d1d5b8 /drivers/scsi/aic94xx | |
| parent | 198a956a11b15b564ac06d1411881e215b587408 (diff) | |
| parent | e86fb5e8ab95f10ec5f2e9430119d5d35020c951 (diff) | |
Merge remote-tracking branch 'scsi-queue/drivers-for-3.19' into for-linus
Diffstat (limited to 'drivers/scsi/aic94xx')
| -rw-r--r-- | drivers/scsi/aic94xx/aic94xx_init.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/drivers/scsi/aic94xx/aic94xx_init.c b/drivers/scsi/aic94xx/aic94xx_init.c index 14fc018436c2..02a2512b76a8 100644 --- a/drivers/scsi/aic94xx/aic94xx_init.c +++ b/drivers/scsi/aic94xx/aic94xx_init.c | |||
| @@ -63,7 +63,6 @@ static struct scsi_host_template aic94xx_sht = { | |||
| 63 | .scan_finished = asd_scan_finished, | 63 | .scan_finished = asd_scan_finished, |
| 64 | .scan_start = asd_scan_start, | 64 | .scan_start = asd_scan_start, |
| 65 | .change_queue_depth = sas_change_queue_depth, | 65 | .change_queue_depth = sas_change_queue_depth, |
| 66 | .change_queue_type = sas_change_queue_type, | ||
| 67 | .bios_param = sas_bios_param, | 66 | .bios_param = sas_bios_param, |
| 68 | .can_queue = 1, | 67 | .can_queue = 1, |
| 69 | .cmd_per_lun = 1, | 68 | .cmd_per_lun = 1, |