diff options
| author | Bjorn Helgaas <bhelgaas@google.com> | 2016-03-15 09:56:16 -0400 |
|---|---|---|
| committer | Bjorn Helgaas <bhelgaas@google.com> | 2016-03-15 09:56:16 -0400 |
| commit | cfeb8139a1fbbbae3f1e986133f4e9e7833eeac4 (patch) | |
| tree | 0f3a162561d9a64cf4f509fb516f2d58f70530d9 /include/linux/pci.h | |
| parent | 562df5c8521e1371f3cbd0b7b868034da376d714 (diff) | |
| parent | 4daace0d8ce851f8f8f91563c835e3000c954d5e (diff) | |
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/linux/pci.h')
| -rw-r--r-- | include/linux/pci.h | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/include/linux/pci.h b/include/linux/pci.h index d6709831efb9..bd757f3c721c 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; } | |||
| 1522 | 1522 | ||
| 1523 | #include <asm/pci.h> | 1523 | #include <asm/pci.h> |
| 1524 | 1524 | ||
| 1525 | #ifndef pci_root_bus_fwnode | ||
| 1526 | #define pci_root_bus_fwnode(bus) NULL | ||
| 1527 | #endif | ||
| 1528 | |||
| 1525 | /* these helpers provide future and backwards compatibility | 1529 | /* these helpers provide future and backwards compatibility |
| 1526 | * for accessing popular PCI BAR info */ | 1530 | * for accessing popular PCI BAR info */ |
| 1527 | #define pci_resource_start(dev, bar) ((dev)->resource[(bar)].start) | 1531 | #define pci_resource_start(dev, bar) ((dev)->resource[(bar)].start) |