Merge branch 'pci/resource'

  - Use ioremap(), not phys_to_virt() for platform ROM, to fix video ROM
    mapping with CONFIG_HIGHMEM (Mikel Rychliski)

  - Add support for root bus sizing so we don't have to assume host bridge
    windows are known a priori (Ivan Kokshaysky)

  - Fix alpha Nautilus PCI setup, which has been broken since we started
    enforcing window limits in resource allocation (Ivan Kokshaysky)

* pci/resource:
  alpha: Fix nautilus PCI setup
  PCI: Add support for root bus sizing
  PCI: Use ioremap(), not phys_to_virt() for platform ROM

diff --cc include/linux/pci.h
index 226908b,1573473..71c92b8
--- 1/include/linux/pci.h
--- 2/include/linux/pci.h
+++ b/include/linux/pci.h
@@@ -515,8 -510,8 +515,9 @@@ struct pci_host_bridge 
        unsigned int    native_shpc_hotplug:1;  /* OS may use SHPC hotplug */
        unsigned int    native_pme:1;           /* OS may use PCIe PME */
        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,