summaryrefslogtreecommitdiffstats
path: root/drivers/scsi/isci
diff options
context:
space:
mode:
authorJames Bottomley <JBottomley@Parallels.com>2014-12-18 14:56:29 +0100
committerJames Bottomley <JBottomley@Parallels.com>2014-12-18 14:56:29 +0100
commite61745769125a3c788e7aceb2a5fb680ebb461e6 (patch)
treec8219c31767c8d6a64938626dd93069847d1d5b8 /drivers/scsi/isci
parentscsi: blacklist RSOC for Microsoft iSCSI target devices (diff)
parentstorvsc: ring buffer failures may result in I/O freeze (diff)
downloadlinux-e61745769125a3c788e7aceb2a5fb680ebb461e6.tar.xz
linux-e61745769125a3c788e7aceb2a5fb680ebb461e6.zip
Merge remote-tracking branch 'scsi-queue/drivers-for-3.19' into for-linus
Diffstat (limited to 'drivers/scsi/isci')
-rw-r--r--drivers/scsi/isci/init.c1
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 = {
.scan_finished = isci_host_scan_finished,
.scan_start = isci_host_start,
.change_queue_depth = sas_change_queue_depth,
- .change_queue_type = sas_change_queue_type,
.bios_param = sas_bios_param,
.can_queue = ISCI_CAN_QUEUE_VAL,
.cmd_per_lun = 1,