diff options
| author | Linus Torvalds <torvalds@g5.osdl.org> | 2005-10-31 07:34:07 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2005-10-31 07:34:07 -0800 |
| commit | c1d962035d49565d8c7a2d97519012ccb861778a (patch) | |
| tree | c958743946f813ebda2e8fd17c54455fd6f962af /drivers/scsi/libata.h | |
| parent | 4fd5f8267dd37aaebadfabe71d9c808821eea05a (diff) | |
| parent | 005a5a06a6dd13a0ca3f2c6a0218e8d94ed36d8a (diff) | |
| download | kernel-crypto-c1d962035d49565d8c7a2d97519012ccb861778a.tar.gz kernel-crypto-c1d962035d49565d8c7a2d97519012ccb861778a.tar.xz kernel-crypto-c1d962035d49565d8c7a2d97519012ccb861778a.zip | |
Merge branch 'upstream-linus' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/libata-dev
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 10ecd9e15e4..fad051ca467 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); extern int ata_check_atapi_dma(struct ata_queued_cmd *qc); extern void ata_dev_select(struct ata_port *ap, unsigned int device, unsigned int wait, unsigned int can_sleep); -extern void ata_tf_to_host_nolock(struct ata_port *ap, const struct ata_taskfile *tf); extern void swap_buf_le16(u16 *buf, unsigned int buf_words); extern int ata_task_ioctl(struct scsi_device *scsidev, void __user *arg); extern int ata_cmd_ioctl(struct scsi_device *scsidev, void __user *arg); |