diff options
author | James Bottomley <JBottomley@Parallels.com> | 2014-12-08 07:42:02 -0800 |
---|---|---|
committer | James Bottomley <JBottomley@Parallels.com> | 2014-12-08 07:42:25 -0800 |
commit | 096cbc35eaecf5865a3274f21eae26955b32861b (patch) | |
tree | 8c6f085fd648939bfbc6ae41cd3f0204e32c5e07 /drivers/message/fusion/mptscsih.h | |
parent | Merge remote-tracking branch 'scsi-queue/core-for-3.19' into for-linus (diff) | |
parent | libsas: remove task_collector mode (diff) | |
download | linux-dev-096cbc35eaecf5865a3274f21eae26955b32861b.tar.xz linux-dev-096cbc35eaecf5865a3274f21eae26955b32861b.zip |
Merge remote-tracking branch 'scsi-queue/drivers-for-3.19' into for-linus
Conflicts:
drivers/scsi/scsi_debug.c
Agreed and tested resolution to a merge problem between a fix in scsi_debug
and a driver update
Signed-off-by: James Bottomley <JBottomley@Parallels.com>
Diffstat (limited to 'drivers/message/fusion/mptscsih.h')
-rw-r--r-- | drivers/message/fusion/mptscsih.h | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/drivers/message/fusion/mptscsih.h b/drivers/message/fusion/mptscsih.h index e1b1a198a62a..2baeefd9be7a 100644 --- a/drivers/message/fusion/mptscsih.h +++ b/drivers/message/fusion/mptscsih.h @@ -128,8 +128,7 @@ extern int mptscsih_taskmgmt_complete(MPT_ADAPTER *ioc, MPT_FRAME_HDR *mf, MPT_F extern int mptscsih_scandv_complete(MPT_ADAPTER *ioc, MPT_FRAME_HDR *mf, MPT_FRAME_HDR *r); extern int mptscsih_event_process(MPT_ADAPTER *ioc, EventNotificationReply_t *pEvReply); extern int mptscsih_ioc_reset(MPT_ADAPTER *ioc, int post_reset); -extern int mptscsih_change_queue_depth(struct scsi_device *sdev, int qdepth, - int reason); +extern int mptscsih_change_queue_depth(struct scsi_device *sdev, int qdepth); extern u8 mptscsih_raid_id_to_num(MPT_ADAPTER *ioc, u8 channel, u8 id); extern int mptscsih_is_phys_disk(MPT_ADAPTER *ioc, u8 channel, u8 id); extern struct device_attribute *mptscsih_host_attrs[]; |