git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wirel...
[pandora-kernel.git]
/
drivers
/
ata
/
pata_efar.c
diff --git
a/drivers/ata/pata_efar.c
b/drivers/ata/pata_efar.c
index
3bac0e0
..
a088347
100644
(file)
--- a/
drivers/ata/pata_efar.c
+++ b/
drivers/ata/pata_efar.c
@@
-277,8
+277,8
@@
static int efar_init_one (struct pci_dev *pdev, const struct pci_device_id *ent)
dev_printk(KERN_DEBUG, &pdev->dev,
"version " DRV_VERSION "\n");
dev_printk(KERN_DEBUG, &pdev->dev,
"version " DRV_VERSION "\n");
- return ata_pci_
sff
_init_one(pdev, ppi, &efar_sht, NULL,
-
ATA_HOST_PARALLEL_SCAN);
+ return ata_pci_
bmdma
_init_one(pdev, ppi, &efar_sht, NULL,
+ ATA_HOST_PARALLEL_SCAN);
}
static const struct pci_device_id efar_pci_tbl[] = {
}
static const struct pci_device_id efar_pci_tbl[] = {