diff options
| author | Paul Mackerras <paulus@samba.org> | 2005-11-01 23:20:55 -0500 |
|---|---|---|
| committer | Paul Mackerras <paulus@samba.org> | 2005-11-01 23:20:55 -0500 |
| commit | de2d3dbd17e6bb60bde4632ce1c7df063b073934 (patch) | |
| tree | dfccb1a2717a8a042a87dbade509f894810ea1cd /drivers/scsi/libata.h | |
| parent | 104dd65fef378773ec0510c788bd4b5ad6ea1121 (diff) | |
| parent | df70b17f88a4d1d8545d3569a1f6d28c6004f9e4 (diff) | |
Merge ../linux-2.6
Diffstat (limited to 'drivers/scsi/libata.h')
| -rw-r--r-- | drivers/scsi/libata.h | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/drivers/scsi/libata.h b/drivers/scsi/libata.h index 10ecd9e15e4f..fad051ca4672 100644 --- a/drivers/scsi/libata.h +++ b/drivers/scsi/libata.h | |||
| @@ -48,7 +48,6 @@ 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, const struct ata_taskfile *tf); | ||
| 52 | extern void swap_buf_le16(u16 *buf, unsigned int buf_words); | 51 | extern void swap_buf_le16(u16 *buf, unsigned int buf_words); |
| 53 | extern int ata_task_ioctl(struct scsi_device *scsidev, void __user *arg); | 52 | 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); | 53 | extern int ata_cmd_ioctl(struct scsi_device *scsidev, void __user *arg); |