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/lpfc/lpfc_scsi.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/lpfc/lpfc_scsi.c')
-rw-r--r-- | drivers/scsi/lpfc/lpfc_scsi.c | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/drivers/scsi/lpfc/lpfc_scsi.c b/drivers/scsi/lpfc/lpfc_scsi.c index fd85952b621d..4f9222eb2266 100644 --- a/drivers/scsi/lpfc/lpfc_scsi.c +++ b/drivers/scsi/lpfc/lpfc_scsi.c | |||
@@ -5879,7 +5879,6 @@ struct scsi_host_template lpfc_template = { | |||
5879 | .max_sectors = 0xFFFF, | 5879 | .max_sectors = 0xFFFF, |
5880 | .vendor_id = LPFC_NL_VENDOR_ID, | 5880 | .vendor_id = LPFC_NL_VENDOR_ID, |
5881 | .change_queue_depth = scsi_change_queue_depth, | 5881 | .change_queue_depth = scsi_change_queue_depth, |
5882 | .change_queue_type = scsi_change_queue_type, | ||
5883 | .use_blk_tags = 1, | 5882 | .use_blk_tags = 1, |
5884 | .track_queue_depth = 1, | 5883 | .track_queue_depth = 1, |
5885 | }; | 5884 | }; |
@@ -5904,7 +5903,6 @@ struct scsi_host_template lpfc_vport_template = { | |||
5904 | .shost_attrs = lpfc_vport_attrs, | 5903 | .shost_attrs = lpfc_vport_attrs, |
5905 | .max_sectors = 0xFFFF, | 5904 | .max_sectors = 0xFFFF, |
5906 | .change_queue_depth = scsi_change_queue_depth, | 5905 | .change_queue_depth = scsi_change_queue_depth, |
5907 | .change_queue_type = scsi_change_queue_type, | ||
5908 | .use_blk_tags = 1, | 5906 | .use_blk_tags = 1, |
5909 | .track_queue_depth = 1, | 5907 | .track_queue_depth = 1, |
5910 | }; | 5908 | }; |