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/isci/init.c | |
| parent | 198a956a11b15b564ac06d1411881e215b587408 (diff) | |
| parent | e86fb5e8ab95f10ec5f2e9430119d5d35020c951 (diff) | |
Merge remote-tracking branch 'scsi-queue/drivers-for-3.19' into for-linus
Diffstat (limited to 'drivers/scsi/isci/init.c')
| -rw-r--r-- | drivers/scsi/isci/init.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/drivers/scsi/isci/init.c b/drivers/scsi/isci/init.c index 724c6265b667..cd41b63a2f10 100644 --- a/drivers/scsi/isci/init.c +++ b/drivers/scsi/isci/init.c | |||
| @@ -158,7 +158,6 @@ static struct scsi_host_template isci_sht = { | |||
| 158 | .scan_finished = isci_host_scan_finished, | 158 | .scan_finished = isci_host_scan_finished, |
| 159 | .scan_start = isci_host_start, | 159 | .scan_start = isci_host_start, |
| 160 | .change_queue_depth = sas_change_queue_depth, | 160 | .change_queue_depth = sas_change_queue_depth, |
| 161 | .change_queue_type = sas_change_queue_type, | ||
| 162 | .bios_param = sas_bios_param, | 161 | .bios_param = sas_bios_param, |
| 163 | .can_queue = ISCI_CAN_QUEUE_VAL, | 162 | .can_queue = ISCI_CAN_QUEUE_VAL, |
| 164 | .cmd_per_lun = 1, | 163 | .cmd_per_lun = 1, |