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 'x86-apic-cleanups-for-linus' of git://git.kernel.org/pub/scm/linux...
[pandora-kernel.git]
/
drivers
/
ata
/
pata_acpi.c
diff --git
a/drivers/ata/pata_acpi.c
b/drivers/ata/pata_acpi.c
index
066b9f3
..
c8d4703
100644
(file)
--- a/
drivers/ata/pata_acpi.c
+++ b/
drivers/ata/pata_acpi.c
@@
-260,7
+260,7
@@
static int pacpi_init_one (struct pci_dev *pdev, const struct pci_device_id *id)
return rc;
pcim_pin_device(pdev);
}
- return ata_pci_
sff
_init_one(pdev, ppi, &pacpi_sht, NULL, 0);
+ return ata_pci_
bmdma
_init_one(pdev, ppi, &pacpi_sht, NULL, 0);
}
static const struct pci_device_id pacpi_pci_tbl[] = {