Merge branch 'pci/resource'

[linux-2.6-microblaze.git] / include / linux / pci.h

diff --git a/include/linux/pci.h b/include/linux/pci.h
index 226908b..71c92b8 100644 (file)
--- a/include/linux/pci.h
+++ b/include/linux/pci.h
@@ -517,6 +517,7 @@ struct pci_host_bridge {
        unsigned int    native_ltr:1;           /* OS may use PCIe LTR */
        unsigned int    native_dpc:1;           /* OS may use PCIe DPC */
        unsigned int    preserve_config:1;      /* Preserve FW resource setup */
+       unsigned int    size_windows:1;         /* Enable root bus sizing */
 
        /* Resource alignment requirements */
        resource_size_t (*align_resource)(struct pci_dev *dev,
@@ -1220,7 +1221,6 @@ int pci_enable_rom(struct pci_dev *pdev);
 void pci_disable_rom(struct pci_dev *pdev);
 void __iomem __must_check *pci_map_rom(struct pci_dev *pdev, size_t *size);
 void pci_unmap_rom(struct pci_dev *pdev, void __iomem *rom);
-void __iomem __must_check *pci_platform_rom(struct pci_dev *pdev, size_t *size);
 
 /* Power management related routines */
 int pci_save_state(struct pci_dev *dev);