summaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
authorBjorn Helgaas <bhelgaas@google.com>2016-03-15 13:56:16 (GMT)
committerBjorn Helgaas <bhelgaas@google.com>2016-03-15 13:56:16 (GMT)
commitcfeb8139a1fbbbae3f1e986133f4e9e7833eeac4 (patch)
tree0f3a162561d9a64cf4f509fb516f2d58f70530d9 /include
parent562df5c8521e1371f3cbd0b7b868034da376d714 (diff)
parent4daace0d8ce851f8f8f91563c835e3000c954d5e (diff)
downloadlinux-cfeb8139a1fbbbae3f1e986133f4e9e7833eeac4.tar.xz
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
Diffstat (limited to 'include')
-rw-r--r--include/linux/pci.h4
1 files changed, 4 insertions, 0 deletions
diff --git a/include/linux/pci.h b/include/linux/pci.h
index d670983..bd757f3 100644
--- a/include/linux/pci.h
+++ b/include/linux/pci.h
@@ -1522,6 +1522,10 @@ static inline int pci_get_new_domain_nr(void) { return -ENOSYS; }
#include <asm/pci.h>
+#ifndef pci_root_bus_fwnode
+#define pci_root_bus_fwnode(bus) NULL
+#endif
+
/* these helpers provide future and backwards compatibility
* for accessing popular PCI BAR info */
#define pci_resource_start(dev, bar) ((dev)->resource[(bar)].start)