summary refs log tree commit diff
path: root/drivers/scsi/mpt3sas/mpt3sas_scsih.c
diff options
context:
space:
mode:
authorJames Bottomley <JBottomley@Parallels.com>2014-12-18 05:56:29 -0800
committerJames Bottomley <JBottomley@Parallels.com>2014-12-18 05:56:29 -0800
commite61745769125a3c788e7aceb2a5fb680ebb461e6 (patch)
treec8219c31767c8d6a64938626dd93069847d1d5b8 /drivers/scsi/mpt3sas/mpt3sas_scsih.c
parent198a956a11b15b564ac06d1411881e215b587408 (diff)
parente86fb5e8ab95f10ec5f2e9430119d5d35020c951 (diff)
downloadlinux-e61745769125a3c788e7aceb2a5fb680ebb461e6.tar.gz
Merge remote-tracking branch 'scsi-queue/drivers-for-3.19' into for-linus
Diffstat (limited to 'drivers/scsi/mpt3sas/mpt3sas_scsih.c')
-rw-r--r--drivers/scsi/mpt3sas/mpt3sas_scsih.c1
1 files changed, 0 insertions, 1 deletions
diff --git a/drivers/scsi/mpt3sas/mpt3sas_scsih.c b/drivers/scsi/mpt3sas/mpt3sas_scsih.c
index a2b60991efd4..94261ee9e72d 100644
--- a/drivers/scsi/mpt3sas/mpt3sas_scsih.c
+++ b/drivers/scsi/mpt3sas/mpt3sas_scsih.c
@@ -7229,7 +7229,6 @@ static struct scsi_host_template scsih_driver_template = {
 	.scan_finished			= _scsih_scan_finished,
 	.scan_start			= _scsih_scan_start,
 	.change_queue_depth		= _scsih_change_queue_depth,
-	.change_queue_type		= scsi_change_queue_type,
 	.eh_abort_handler		= _scsih_abort,
 	.eh_device_reset_handler	= _scsih_dev_reset,
 	.eh_target_reset_handler	= _scsih_target_reset,