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_mv.c | |
| parent | 7dfb869c8e45e5863534f38fdac990829b22964a (diff) | |
| parent | 041c5fc33cb7ed4fe5322585a611fb6e29a05d3a (diff) | |
Merge branch 'tmp'
Diffstat (limited to 'drivers/scsi/sata_mv.c')
| -rw-r--r-- | drivers/scsi/sata_mv.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/scsi/sata_mv.c b/drivers/scsi/sata_mv.c index 68d17791896f..498d6284a2f7 100644 --- a/drivers/scsi/sata_mv.c +++ b/drivers/scsi/sata_mv.c | |||
| @@ -328,7 +328,7 @@ static void mv_host_stop(struct ata_host_set *host_set); | |||
| 328 | static int mv_port_start(struct ata_port *ap); | 328 | static int mv_port_start(struct ata_port *ap); |
| 329 | static void mv_port_stop(struct ata_port *ap); | 329 | static void mv_port_stop(struct ata_port *ap); |
| 330 | static void mv_qc_prep(struct ata_queued_cmd *qc); | 330 | static void mv_qc_prep(struct ata_queued_cmd *qc); |
| 331 | static int mv_qc_issue(struct ata_queued_cmd *qc); | 331 | static unsigned int mv_qc_issue(struct ata_queued_cmd *qc); |
| 332 | static irqreturn_t mv_interrupt(int irq, void *dev_instance, | 332 | static irqreturn_t mv_interrupt(int irq, void *dev_instance, |
| 333 | struct pt_regs *regs); | 333 | struct pt_regs *regs); |
| 334 | static void mv_eng_timeout(struct ata_port *ap); | 334 | static void mv_eng_timeout(struct ata_port *ap); |
| @@ -1040,7 +1040,7 @@ static void mv_qc_prep(struct ata_queued_cmd *qc) | |||
| 1040 | * LOCKING: | 1040 | * LOCKING: |
| 1041 | * Inherited from caller. | 1041 | * Inherited from caller. |
| 1042 | */ | 1042 | */ |
| 1043 | static int mv_qc_issue(struct ata_queued_cmd *qc) | 1043 | static unsigned int mv_qc_issue(struct ata_queued_cmd *qc) |
| 1044 | { | 1044 | { |
| 1045 | void __iomem *port_mmio = mv_ap_base(qc->ap); | 1045 | void __iomem *port_mmio = mv_ap_base(qc->ap); |
| 1046 | struct mv_port_priv *pp = qc->ap->private_data; | 1046 | struct mv_port_priv *pp = qc->ap->private_data; |