diff options
| author | Bjorn Helgaas <bhelgaas@google.com> | 2012-11-09 21:00:07 +0400 |
|---|---|---|
| committer | Bjorn Helgaas <bhelgaas@google.com> | 2012-11-09 21:00:07 +0400 |
| commit | 05508270064efd674e8f2a047911dcd7776aaae0 (patch) | |
| tree | 87ae59fbeb5ad6d3d0d155e1b85436a9047458a0 /drivers/pci | |
| parent | fa20f6f240e127bc914ca980a4b10c723c55fec9 (diff) | |
| parent | 8c33f51df406e1a1f7fa4e9b244845b7ebd61fa6 (diff) | |
| download | linux-05508270064efd674e8f2a047911dcd7776aaae0.tar.xz | |
Merge branch 'pci/taku-prt-cleanup' into next
* pci/taku-prt-cleanup:
PCI/ACPI: Request _OSC control before scanning PCI root bus
PCI: Don't pass pci_dev to pci_ext_cfg_avail()
PCI/ACPI: Add _PRT interrupt routing info before enumerating devices
ACPI: Pass segment/bus to _PRT add/del so they don't depend on pci_bus
Diffstat (limited to 'drivers/pci')
| -rw-r--r-- | drivers/pci/pci.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/drivers/pci/pci.c b/drivers/pci/pci.c index 485cfa9af2ef..05a510d1bb30 100644 --- a/drivers/pci/pci.c +++ b/drivers/pci/pci.c @@ -3843,14 +3843,13 @@ static void __devinit pci_no_domains(void) } /** - * pci_ext_cfg_enabled - can we access extended PCI config space? - * @dev: The PCI device of the root bridge. + * pci_ext_cfg_avail - can we access extended PCI config space? * * Returns 1 if we can access PCI extended config space (offsets * greater than 0xff). This is the default implementation. Architecture * implementations can override this. */ -int __weak pci_ext_cfg_avail(struct pci_dev *dev) +int __weak pci_ext_cfg_avail(void) { return 1; } |