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/include/linux/pci.h b/include/linux/pci.h
index ea41a0a52a59..d11cc6e79994 100644
--- a/include/linux/pci.h
+++ b/include/linux/pci.h
@@ -333,7 +333,7 @@ struct pci_dev {
         };
         struct pci_ats  *ats;   /* Address Translation Service */
 #endif
-        void *rom; /* Physical pointer to ROM if it's not from the BAR */
+        phys_addr_t rom; /* Physical address of ROM if it's not from the BAR */
         size_t romlen; /* Length of ROM if it's not from the BAR */
 };