diff options
| author | Bjorn Helgaas <bhelgaas@google.com> | 2012-09-11 17:01:54 -0600 |
|---|---|---|
| committer | Bjorn Helgaas <bhelgaas@google.com> | 2012-09-11 17:01:54 -0600 |
| commit | a63ab613ff48c593f4e9ace2d111978e35a202e4 (patch) | |
| tree | 067f8172d1a72625458e31869bb587eae5279b80 /include/linux/pci.h | |
| parent | a690a4cbf09f70723f9721ca96ab8b2b472b3391 (diff) | |
| parent | 271fd03a3013b106ccc178d54219c1be0c9759b7 (diff) | |
| download | lwn-a63ab613ff48c593f4e9ace2d111978e35a202e4.tar.gz lwn-a63ab613ff48c593f4e9ace2d111978e35a202e4.zip | |
Merge branch 'pci/gavin-window-alignment' into next
* pci/gavin-window-alignment:
powerpc/powernv: I/O and memory alignment for P2P bridges
powerpc/PCI: Override pcibios_window_alignment()
PCI: Refactor pbus_size_mem()
PCI: Align P2P windows using pcibios_window_alignment()
PCI: Add weak pcibios_window_alignment() interface
Diffstat (limited to 'include/linux/pci.h')
| -rw-r--r-- | include/linux/pci.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/include/linux/pci.h b/include/linux/pci.h index 0d8718904e88..e52f16189cda 100644 --- a/include/linux/pci.h +++ b/include/linux/pci.h @@ -1061,6 +1061,8 @@ int pci_cfg_space_size_ext(struct pci_dev *dev); int pci_cfg_space_size(struct pci_dev *dev); unsigned char pci_bus_max_busnr(struct pci_bus *bus); void pci_setup_bridge(struct pci_bus *bus); +resource_size_t pcibios_window_alignment(struct pci_bus *bus, + unsigned long type); #define PCI_VGA_STATE_CHANGE_BRIDGE (1 << 0) #define PCI_VGA_STATE_CHANGE_DECODES (1 << 1) |