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 | 7dfb869c8e45e5863534f38fdac990829b22964a (diff) | |
| parent | 041c5fc33cb7ed4fe5322585a611fb6e29a05d3a (diff) | |
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); | |||
| 96 | static void pdc_tf_load_mmio(struct ata_port *ap, const struct ata_taskfile *tf); | 96 | static void pdc_tf_load_mmio(struct ata_port *ap, const struct ata_taskfile *tf); |
| 97 | static void pdc_exec_command_mmio(struct ata_port *ap, const struct ata_taskfile *tf); | 97 | static void pdc_exec_command_mmio(struct ata_port *ap, const struct ata_taskfile *tf); |
| 98 | static void pdc_irq_clear(struct ata_port *ap); | 98 | static void pdc_irq_clear(struct ata_port *ap); |
| 99 | static int pdc_qc_issue_prot(struct ata_queued_cmd *qc); | 99 | static unsigned int pdc_qc_issue_prot(struct ata_queued_cmd *qc); |
| 100 | 100 | ||
| 101 | 101 | ||
| 102 | static struct scsi_host_template pdc_ata_sht = { | 102 | static struct scsi_host_template pdc_ata_sht = { |
| @@ -545,7 +545,7 @@ static inline void pdc_packet_start(struct ata_queued_cmd *qc) | |||
| 545 | readl((void __iomem *) ap->ioaddr.cmd_addr + PDC_PKT_SUBMIT); /* flush */ | 545 | readl((void __iomem *) ap->ioaddr.cmd_addr + PDC_PKT_SUBMIT); /* flush */ |
| 546 | } | 546 | } |
| 547 | 547 | ||
| 548 | static int pdc_qc_issue_prot(struct ata_queued_cmd *qc) | 548 | static unsigned int pdc_qc_issue_prot(struct ata_queued_cmd *qc) |
| 549 | { | 549 | { |
| 550 | switch (qc->tf.protocol) { | 550 | switch (qc->tf.protocol) { |
| 551 | case ATA_PROT_DMA: | 551 | case ATA_PROT_DMA: |