diff options
| author | James Bottomley <JBottomley@Parallels.com> | 2014-12-18 14:56:29 +0100 |
|---|---|---|
| committer | James Bottomley <JBottomley@Parallels.com> | 2014-12-18 14:56:29 +0100 |
| commit | e61745769125a3c788e7aceb2a5fb680ebb461e6 (patch) | |
| tree | c8219c31767c8d6a64938626dd93069847d1d5b8 /drivers/scsi/lpfc | |
| parent | scsi: blacklist RSOC for Microsoft iSCSI target devices (diff) | |
| parent | storvsc: ring buffer failures may result in I/O freeze (diff) | |
| download | linux-e61745769125a3c788e7aceb2a5fb680ebb461e6.tar.xz linux-e61745769125a3c788e7aceb2a5fb680ebb461e6.zip | |
Merge remote-tracking branch 'scsi-queue/drivers-for-3.19' into for-linus
Diffstat (limited to 'drivers/scsi/lpfc')
| -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 = { .max_sectors = 0xFFFF, .vendor_id = LPFC_NL_VENDOR_ID, .change_queue_depth = scsi_change_queue_depth, - .change_queue_type = scsi_change_queue_type, .use_blk_tags = 1, .track_queue_depth = 1, }; @@ -5904,7 +5903,6 @@ struct scsi_host_template lpfc_vport_template = { .shost_attrs = lpfc_vport_attrs, .max_sectors = 0xFFFF, .change_queue_depth = scsi_change_queue_depth, - .change_queue_type = scsi_change_queue_type, .use_blk_tags = 1, .track_queue_depth = 1, }; |