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_sx4.c | |
| parent | 7dfb869c8e45e5863534f38fdac990829b22964a (diff) | |
| parent | 041c5fc33cb7ed4fe5322585a611fb6e29a05d3a (diff) | |
Merge branch 'tmp'
Diffstat (limited to 'drivers/scsi/sata_sx4.c')
| -rw-r--r-- | drivers/scsi/sata_sx4.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/scsi/sata_sx4.c b/drivers/scsi/sata_sx4.c index 9d8e4226c25c..db08a8ba9ea7 100644 --- a/drivers/scsi/sata_sx4.c +++ b/drivers/scsi/sata_sx4.c | |||
| @@ -174,7 +174,7 @@ static void pdc20621_get_from_dimm(struct ata_probe_ent *pe, | |||
| 174 | static void pdc20621_put_to_dimm(struct ata_probe_ent *pe, | 174 | static void pdc20621_put_to_dimm(struct ata_probe_ent *pe, |
| 175 | void *psource, u32 offset, u32 size); | 175 | void *psource, u32 offset, u32 size); |
| 176 | static void pdc20621_irq_clear(struct ata_port *ap); | 176 | static void pdc20621_irq_clear(struct ata_port *ap); |
| 177 | static int pdc20621_qc_issue_prot(struct ata_queued_cmd *qc); | 177 | static unsigned int pdc20621_qc_issue_prot(struct ata_queued_cmd *qc); |
| 178 | 178 | ||
| 179 | 179 | ||
| 180 | static struct scsi_host_template pdc_sata_sht = { | 180 | static struct scsi_host_template pdc_sata_sht = { |
| @@ -678,7 +678,7 @@ static void pdc20621_packet_start(struct ata_queued_cmd *qc) | |||
| 678 | } | 678 | } |
| 679 | } | 679 | } |
| 680 | 680 | ||
| 681 | static int pdc20621_qc_issue_prot(struct ata_queued_cmd *qc) | 681 | static unsigned int pdc20621_qc_issue_prot(struct ata_queued_cmd *qc) |
| 682 | { | 682 | { |
| 683 | switch (qc->tf.protocol) { | 683 | switch (qc->tf.protocol) { |
| 684 | case ATA_PROT_DMA: | 684 | case ATA_PROT_DMA: |