From: Bjorn Helgaas <bhelgaas@google.com>
Date: Tue, 15 Mar 2016 13:56:16 +0000 (-0500)
Subject: Merge branch 'pci/host-hv' into next
X-Git-Url: http://drtracing.org/?a=commitdiff_plain;h=cfeb8139a1fb;p=deliverable%2Flinux.git

Merge branch 'pci/host-hv' into next

* pci/host-hv:
  PCI: hv: Add paravirtual PCI front-end for Microsoft Hyper-V VMs
  PCI: Look up IRQ domain by fwnode_handle
  PCI: Add fwnode_handle to x86 pci_sysdata
---

cfeb8139a1fbbbae3f1e986133f4e9e7833eeac4
diff --cc drivers/pci/probe.c
index b23449902a17,1e34d211389a..c4e1eff8b07c
--- a/drivers/pci/probe.c
+++ b/drivers/pci/probe.c
@@@ -15,6 -15,8 +15,7 @@@
  #include <linux/pci-aspm.h>
  #include <linux/aer.h>
  #include <linux/acpi.h>
+ #include <linux/irqdomain.h>
 -#include <asm-generic/pci-bridge.h>
  #include "pci.h"
  
  #define CARDBUS_LATENCY_TIMER	176	/* secondary latency timer */