diff options
author | Linus Torvalds <torvalds@g5.osdl.org> | 2006-01-04 16:32:33 -0800 |
---|---|---|
committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-01-04 16:32:33 -0800 |
commit | 1cb9e8e01d2c73184e2074f37cd155b3c4fdaae6 (patch) | |
tree | 3c8d1716cd53ed77a935036090323a1ae9a7963b /drivers/scsi/libata.h | |
parent | d779188d2baf436e67fe8816fca2ef53d246900f (diff) | |
parent | a18ceba7b40e24a9da87249bd74f16ea5abd6894 (diff) |
Merge branch 'upstream' 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 8ebaa694d18..251e53bdc6e 100644 --- a/drivers/scsi/libata.h +++ b/drivers/scsi/libata.h @@ -39,7 +39,6 @@ struct ata_scsi_args { /* libata-core.c */ extern int atapi_enabled; -extern int ata_qc_complete_noop(struct ata_queued_cmd *qc, unsigned int err_mask); extern struct ata_queued_cmd *ata_qc_new_init(struct ata_port *ap, struct ata_device *dev); extern void ata_rwcmd_protocol(struct ata_queued_cmd *qc); |