diff options
author | David S. Miller <davem@davemloft.net> | 2010-06-26 19:27:00 +0200 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2010-06-26 19:27:00 +0200 |
commit | c67dda14389205f0a223c5089307495290939b3b (patch) | |
tree | fad0bb26b28703d02a22ebdd44d94eabac4a2ade /drivers/ata/pata_cs5530.c | |
parent | sparc64: fix the build error due to smp_kgdb_capture_client() (diff) | |
parent | Linux 2.6.35-rc3 (diff) | |
download | linux-c67dda14389205f0a223c5089307495290939b3b.tar.xz linux-c67dda14389205f0a223c5089307495290939b3b.zip |
Merge branch 'master' of /home/davem/src/GIT/linux-2.6/
Diffstat (limited to 'drivers/ata/pata_cs5530.c')
-rw-r--r-- | drivers/ata/pata_cs5530.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/ata/pata_cs5530.c b/drivers/ata/pata_cs5530.c index e809a4233a81..f792330f0d8e 100644 --- a/drivers/ata/pata_cs5530.c +++ b/drivers/ata/pata_cs5530.c @@ -324,7 +324,7 @@ static int cs5530_init_one(struct pci_dev *pdev, const struct pci_device_id *id) ppi[1] = &info_palmax_secondary; /* Now kick off ATA set up */ - return ata_pci_sff_init_one(pdev, ppi, &cs5530_sht, NULL, 0); + return ata_pci_bmdma_init_one(pdev, ppi, &cs5530_sht, NULL, 0); } #ifdef CONFIG_PM |