From: Bjorn Helgaas <bhelgaas@google.com>
Date: Sun, 27 Jan 2013 00:35:58 +0000 (-0700)
Subject: Merge branch 'pci/yinghai-root-bus-hotplug' into next
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=939de1d69c5fb0da0cfe05a1a7c981421cf876f7;p=GitHub%2FLineageOS%2Fandroid_kernel_samsung_universal7580.git

Merge branch 'pci/yinghai-root-bus-hotplug' into next

* pci/yinghai-root-bus-hotplug:
  PCI: Put pci_dev in device tree as early as possible
  PCI: Skip attaching driver in device_add()
  PCI: acpiphp: Keep driver loaded even if no slots found
  PCI/ACPI: Print info if host bridge notify handler installation fails
  PCI: acpiphp: Move host bridge hotplug to pci_root.c
  PCI/ACPI: acpiphp: Rename alloc_acpiphp_hp_work() to alloc_acpi_hp_work()
  PCI: Make device create/destroy logic symmetric
  PCI: Fix reference count leak in pci_dev_present()
  PCI: Set pci_dev dev_node early so IOAPIC irq_descs are allocated locally
  PCI: Add root bus children dev's res to fail list
  PCI: acpiphp: Add is_hotplug_bridge detection

Conflicts:
	drivers/pci/pci.h
---

939de1d69c5fb0da0cfe05a1a7c981421cf876f7
diff --cc drivers/pci/pci.h
index 81b6a875251,d295e7b0e64..7346ee68f47
--- a/drivers/pci/pci.h
+++ b/drivers/pci/pci.h
@@@ -203,8 -203,7 +203,8 @@@ extern int __pci_read_base(struct pci_d
  				struct resource *res, unsigned int reg);
  extern int pci_resource_bar(struct pci_dev *dev, int resno,
  			    enum pci_bar_type *type);
- extern int pci_bus_add_child(struct pci_bus *bus);
 -extern void pci_enable_ari(struct pci_dev *dev);
 +extern void pci_configure_ari(struct pci_dev *dev);
++
  /**
   * pci_ari_enabled - query ARI forwarding status
   * @bus: the PCI bus