diff options
author | Jeff Garzik <jgarzik@pobox.com> | 2006-01-27 02:37:46 -0500 |
---|---|---|
committer | Jeff Garzik <jgarzik@pobox.com> | 2006-01-27 02:37:46 -0500 |
commit | b4d28889f7ebfe498dedaceb773b4c785b97d195 (patch) | |
tree | 7ac1070f4c956d035f40cc3b381b5868b980fafa /include/linux/libata.h | |
parent | 7dfb869c8e45e5863534f38fdac990829b22964a (diff) | |
parent | 041c5fc33cb7ed4fe5322585a611fb6e29a05d3a (diff) | |
download | op-kernel-dev-b4d28889f7ebfe498dedaceb773b4c785b97d195.zip op-kernel-dev-b4d28889f7ebfe498dedaceb773b4c785b97d195.tar.gz |
Merge branch 'tmp'
Diffstat (limited to 'include/linux/libata.h')
-rw-r--r-- | include/linux/libata.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/include/linux/libata.h b/include/linux/libata.h index 510aee8..5915f76 100644 --- a/include/linux/libata.h +++ b/include/linux/libata.h @@ -430,7 +430,7 @@ struct ata_port_operations { void (*bmdma_start) (struct ata_queued_cmd *qc); void (*qc_prep) (struct ata_queued_cmd *qc); - int (*qc_issue) (struct ata_queued_cmd *qc); + unsigned int (*qc_issue) (struct ata_queued_cmd *qc); void (*eng_timeout) (struct ata_port *ap); @@ -518,7 +518,7 @@ extern void ata_port_stop (struct ata_port *ap); extern void ata_host_stop (struct ata_host_set *host_set); extern irqreturn_t ata_interrupt (int irq, void *dev_instance, struct pt_regs *regs); extern void ata_qc_prep(struct ata_queued_cmd *qc); -extern int ata_qc_issue_prot(struct ata_queued_cmd *qc); +extern unsigned int ata_qc_issue_prot(struct ata_queued_cmd *qc); extern void ata_sg_init_one(struct ata_queued_cmd *qc, void *buf, unsigned int buflen); extern void ata_sg_init(struct ata_queued_cmd *qc, struct scatterlist *sg, |