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/pdc_adma.c | |
| parent | 7dfb869c8e45e5863534f38fdac990829b22964a (diff) | |
| parent | 041c5fc33cb7ed4fe5322585a611fb6e29a05d3a (diff) | |
| download | linux-b4d28889f7ebfe498dedaceb773b4c785b97d195.tar.gz linux-b4d28889f7ebfe498dedaceb773b4c785b97d195.tar.bz2 linux-b4d28889f7ebfe498dedaceb773b4c785b97d195.zip | |
Merge branch 'tmp'
Diffstat (limited to 'drivers/scsi/pdc_adma.c')
| -rw-r--r-- | drivers/scsi/pdc_adma.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/scsi/pdc_adma.c b/drivers/scsi/pdc_adma.c index 4daede86f00a..2dca6c53868a 100644 --- a/drivers/scsi/pdc_adma.c +++ b/drivers/scsi/pdc_adma.c @@ -131,7 +131,7 @@ static void adma_host_stop(struct ata_host_set *host_set); static void adma_port_stop(struct ata_port *ap); static void adma_phy_reset(struct ata_port *ap); static void adma_qc_prep(struct ata_queued_cmd *qc); -static int adma_qc_issue(struct ata_queued_cmd *qc); +static unsigned int adma_qc_issue(struct ata_queued_cmd *qc); static int adma_check_atapi_dma(struct ata_queued_cmd *qc); static void adma_bmdma_stop(struct ata_queued_cmd *qc); static u8 adma_bmdma_status(struct ata_port *ap); @@ -419,7 +419,7 @@ static inline void adma_packet_start(struct ata_queued_cmd *qc) writew(aPIOMD4 | aGO, chan + ADMA_CONTROL); } -static int adma_qc_issue(struct ata_queued_cmd *qc) +static unsigned int adma_qc_issue(struct ata_queued_cmd *qc) { struct adma_port_priv *pp = qc->ap->private_data; |