git://ftp.safe.ca
/
safe
/
jmp
/
linux-2.6
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'for-next' into for-linus
[safe/jmp/linux-2.6]
/
drivers
/
ata
/
pata_acpi.c
diff --git
a/drivers/ata/pata_acpi.c
b/drivers/ata/pata_acpi.c
index
9e33da9
..
8e5e132
100644
(file)
--- a/
drivers/ata/pata_acpi.c
+++ b/
drivers/ata/pata_acpi.c
@@
-259,7
+259,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);
+ return ata_pci_sff_init_one(pdev, ppi, &pacpi_sht, NULL
, 0
);
}
static const struct pci_device_id pacpi_pci_tbl[] = {