diff options
| author | Jeff Garzik <jgarzik@pobox.com> | 2005-10-28 12:31:34 -0400 |
|---|---|---|
| committer | Jeff Garzik <jgarzik@pobox.com> | 2005-10-28 12:31:34 -0400 |
| commit | 96b88fb850cc419171f926ad04650ec509e9f543 (patch) | |
| tree | 5bf9537bde467534608b3acdbfa5f7726ede8c3f /drivers/scsi/libata.h | |
| parent | e78a57de94480226f7fc90d0b4837bfc6c99a9e0 (diff) | |
| parent | 5fadd053d9bb4345ec6f405d24db4e7eb49cf81e (diff) | |
Merge branch 'master'
Diffstat (limited to 'drivers/scsi/libata.h')
| -rw-r--r-- | drivers/scsi/libata.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/scsi/libata.h b/drivers/scsi/libata.h index 39cce63dc45d..65c264b91136 100644 --- a/drivers/scsi/libata.h +++ b/drivers/scsi/libata.h | |||
| @@ -48,7 +48,7 @@ extern int ata_qc_issue(struct ata_queued_cmd *qc); | |||
| 48 | extern int ata_check_atapi_dma(struct ata_queued_cmd *qc); | 48 | extern int ata_check_atapi_dma(struct ata_queued_cmd *qc); |
| 49 | extern void ata_dev_select(struct ata_port *ap, unsigned int device, | 49 | extern void ata_dev_select(struct ata_port *ap, unsigned int device, |
| 50 | unsigned int wait, unsigned int can_sleep); | 50 | unsigned int wait, unsigned int can_sleep); |
| 51 | extern void ata_tf_to_host_nolock(struct ata_port *ap, struct ata_taskfile *tf); | 51 | extern void ata_tf_to_host_nolock(struct ata_port *ap, const struct ata_taskfile *tf); |
| 52 | extern void swap_buf_le16(u16 *buf, unsigned int buf_words); | 52 | extern void swap_buf_le16(u16 *buf, unsigned int buf_words); |
| 53 | extern int ata_task_ioctl(struct scsi_device *scsidev, void __user *arg); | 53 | extern int ata_task_ioctl(struct scsi_device *scsidev, void __user *arg); |
| 54 | extern int ata_cmd_ioctl(struct scsi_device *scsidev, void __user *arg); | 54 | extern int ata_cmd_ioctl(struct scsi_device *scsidev, void __user *arg); |