diff options
author | James Bottomley <JBottomley@Parallels.com> | 2014-12-18 05:56:29 -0800 |
---|---|---|
committer | James Bottomley <JBottomley@Parallels.com> | 2014-12-18 05:56:29 -0800 |
commit | e61745769125a3c788e7aceb2a5fb680ebb461e6 (patch) | |
tree | c8219c31767c8d6a64938626dd93069847d1d5b8 /drivers/scsi/fcoe | |
parent | 198a956a11b15b564ac06d1411881e215b587408 (diff) | |
parent | e86fb5e8ab95f10ec5f2e9430119d5d35020c951 (diff) | |
download | blackbird-obmc-linux-e61745769125a3c788e7aceb2a5fb680ebb461e6.tar.gz blackbird-obmc-linux-e61745769125a3c788e7aceb2a5fb680ebb461e6.zip |
Merge remote-tracking branch 'scsi-queue/drivers-for-3.19' into for-linus
Diffstat (limited to 'drivers/scsi/fcoe')
-rw-r--r-- | drivers/scsi/fcoe/fcoe.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/drivers/scsi/fcoe/fcoe.c b/drivers/scsi/fcoe/fcoe.c index cd00a6cdf55b..ec193a8357d7 100644 --- a/drivers/scsi/fcoe/fcoe.c +++ b/drivers/scsi/fcoe/fcoe.c @@ -281,7 +281,6 @@ static struct scsi_host_template fcoe_shost_template = { .eh_host_reset_handler = fc_eh_host_reset, .slave_alloc = fc_slave_alloc, .change_queue_depth = scsi_change_queue_depth, - .change_queue_type = scsi_change_queue_type, .this_id = -1, .cmd_per_lun = 3, .can_queue = FCOE_MAX_OUTSTANDING_COMMANDS, |