diff options
author | Paul Mundt <lethal@linux-sh.org> | 2010-05-24 01:52:55 +0200 |
---|---|---|
committer | Paul Mundt <lethal@linux-sh.org> | 2010-05-24 01:52:55 +0200 |
commit | 1f782fee18b39b9ad438ebbd82c2915a16c879ee (patch) | |
tree | f292930065e6c860714c134790ab8882680ac739 /drivers/ata/pata_cs5530.c | |
parent | ARM: mach-shmobile: add framebuffer support for ap4evb (diff) | |
parent | fbmem: avoid printk format warning with 32-bit resources (diff) | |
download | linux-1f782fee18b39b9ad438ebbd82c2915a16c879ee.tar.xz linux-1f782fee18b39b9ad438ebbd82c2915a16c879ee.zip |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
Diffstat (limited to 'drivers/ata/pata_cs5530.c')
-rw-r--r-- | drivers/ata/pata_cs5530.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/ata/pata_cs5530.c b/drivers/ata/pata_cs5530.c index 738ad2e14a97..e809a4233a81 100644 --- a/drivers/ata/pata_cs5530.c +++ b/drivers/ata/pata_cs5530.c @@ -156,7 +156,7 @@ static unsigned int cs5530_qc_issue(struct ata_queued_cmd *qc) cs5530_set_dmamode(ap, adev); } - return ata_sff_qc_issue(qc); + return ata_bmdma_qc_issue(qc); } static struct scsi_host_template cs5530_sht = { @@ -167,7 +167,7 @@ static struct scsi_host_template cs5530_sht = { static struct ata_port_operations cs5530_port_ops = { .inherits = &ata_bmdma_port_ops, - .qc_prep = ata_sff_dumb_qc_prep, + .qc_prep = ata_bmdma_dumb_qc_prep, .qc_issue = cs5530_qc_issue, .cable_detect = ata_cable_40wire, |