Merge branch 'pci/mjg-pci-roms-from-efi' into next

* pci/mjg-pci-roms-from-efi:
  PCI: Use phys_addr_t for physical ROM address

1 files changed, 1 insertions, 1 deletions

diff --git a/drivers/pci/rom.c b/drivers/pci/rom.c
index 3a3828fbc879..ab886b7ee327 100644
--- a/drivers/pci/rom.c
+++ b/drivers/pci/rom.c
@@ -122,7 +122,7 @@ void __iomem *pci_map_rom(struct pci_dev *pdev, size_t *size)
          */
         if (pdev->rom && pdev->romlen) {
                 *size = pdev->romlen;
-                return phys_to_virt((phys_addr_t)pdev->rom);
+                return phys_to_virt(pdev->rom);
         /*
          * IORESOURCE_ROM_SHADOW set on x86, x86_64 and IA64 supports legacy
          * memory map if the VGA enable bit of the Bridge Control register is