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 /drivers/scsi/sata_promise.c | |
| parent | Merge branch 'tmp' (diff) | |
| parent | [PATCH] SCSI: export scsi_eh_finish_cmd() and scsi_eh_flush_done_q() (diff) | |
| download | linux-dev-b4d28889f7ebfe498dedaceb773b4c785b97d195.tar.xz linux-dev-b4d28889f7ebfe498dedaceb773b4c785b97d195.zip | |
Merge branch 'tmp'
Diffstat (limited to 'drivers/scsi/sata_promise.c')
| -rw-r--r-- | drivers/scsi/sata_promise.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/scsi/sata_promise.c b/drivers/scsi/sata_promise.c index 02b14a870f52..010e08819886 100644 --- a/drivers/scsi/sata_promise.c +++ b/drivers/scsi/sata_promise.c @@ -96,7 +96,7 @@ static void pdc_qc_prep(struct ata_queued_cmd *qc); static void pdc_tf_load_mmio(struct ata_port *ap, const struct ata_taskfile *tf); static void pdc_exec_command_mmio(struct ata_port *ap, const struct ata_taskfile *tf); static void pdc_irq_clear(struct ata_port *ap); -static int pdc_qc_issue_prot(struct ata_queued_cmd *qc); +static unsigned int pdc_qc_issue_prot(struct ata_queued_cmd *qc); static struct scsi_host_template pdc_ata_sht = { @@ -545,7 +545,7 @@ static inline void pdc_packet_start(struct ata_queued_cmd *qc) readl((void __iomem *) ap->ioaddr.cmd_addr + PDC_PKT_SUBMIT); /* flush */ } -static int pdc_qc_issue_prot(struct ata_queued_cmd *qc) +static unsigned int pdc_qc_issue_prot(struct ata_queued_cmd *qc) { switch (qc->tf.protocol) { case ATA_PROT_DMA: |