diff options
| author | Bjorn Helgaas <bhelgaas@google.com> | 2012-11-09 12:00:07 -0500 |
|---|---|---|
| committer | Bjorn Helgaas <bhelgaas@google.com> | 2012-11-09 12:00:07 -0500 |
| commit | 05508270064efd674e8f2a047911dcd7776aaae0 (patch) | |
| tree | 87ae59fbeb5ad6d3d0d155e1b85436a9047458a0 /arch/x86/pci | |
| parent | fa20f6f240e127bc914ca980a4b10c723c55fec9 (diff) | |
| parent | 8c33f51df406e1a1f7fa4e9b244845b7ebd61fa6 (diff) | |
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 'arch/x86/pci')
| -rw-r--r-- | arch/x86/pci/common.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/x86/pci/common.c b/arch/x86/pci/common.c index 720e973fc34a..52dbf1aeeb63 100644 --- a/arch/x86/pci/common.c +++ b/arch/x86/pci/common.c | |||
| @@ -626,7 +626,7 @@ void pcibios_disable_device (struct pci_dev *dev) | |||
| 626 | pcibios_disable_irq(dev); | 626 | pcibios_disable_irq(dev); |
| 627 | } | 627 | } |
| 628 | 628 | ||
| 629 | int pci_ext_cfg_avail(struct pci_dev *dev) | 629 | int pci_ext_cfg_avail(void) |
| 630 | { | 630 | { |
| 631 | if (raw_pci_ext_ops) | 631 | if (raw_pci_ext_ops) |
| 632 | return 1; | 632 | return 1; |