]> git.karo-electronics.de Git - karo-tx-linux.git/commitdiff
Merge branch 'pci/taku-prt-cleanup' into next
authorBjorn Helgaas <bhelgaas@google.com>
Wed, 7 Nov 2012 22:53:33 +0000 (15:53 -0700)
committerBjorn Helgaas <bhelgaas@google.com>
Wed, 7 Nov 2012 22:53:33 +0000 (15:53 -0700)
* 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

1  2 
drivers/pci/pci.c

Simple merge