diff options
| author | James Bottomley <JBottomley@Parallels.com> | 2014-06-09 07:49:39 -0700 |
|---|---|---|
| committer | James Bottomley <JBottomley@Parallels.com> | 2014-06-09 07:49:39 -0700 |
| commit | b4c43993f448d0e25fe40690d9e9c81a8ebda623 (patch) | |
| tree | 7cc19990b0b00226ce3063d956790368bfe62ada /drivers/message/fusion/mptscsih.h | |
| parent | 63ff05910d9652f8a0c4dbb6c7772cfca5364f12 (diff) | |
| parent | e90b25fa40a43f63fc9a035c11ba9ca3e4e60949 (diff) | |
| download | talos-obmc-linux-b4c43993f448d0e25fe40690d9e9c81a8ebda623.tar.gz talos-obmc-linux-b4c43993f448d0e25fe40690d9e9c81a8ebda623.zip | |
Merge remote-tracking branch 'scsi-queue/drivers-for-3.16' into for-linus
Diffstat (limited to 'drivers/message/fusion/mptscsih.h')
| -rw-r--r-- | drivers/message/fusion/mptscsih.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/message/fusion/mptscsih.h b/drivers/message/fusion/mptscsih.h index 83f503162f7a..99e3390807f3 100644 --- a/drivers/message/fusion/mptscsih.h +++ b/drivers/message/fusion/mptscsih.h @@ -113,7 +113,7 @@ extern int mptscsih_resume(struct pci_dev *pdev); #endif extern int mptscsih_show_info(struct seq_file *, struct Scsi_Host *); extern const char * mptscsih_info(struct Scsi_Host *SChost); -extern int mptscsih_qcmd(struct scsi_cmnd *SCpnt, void (*done)(struct scsi_cmnd *)); +extern int mptscsih_qcmd(struct scsi_cmnd *SCpnt); extern int mptscsih_IssueTaskMgmt(MPT_SCSI_HOST *hd, u8 type, u8 channel, u8 id, int lun, int ctx2abort, ulong timeout); extern void mptscsih_slave_destroy(struct scsi_device *device); |
