diff options
| author | Bjorn Helgaas <bhelgaas@google.com> | 2012-12-10 16:20:12 -0700 |
|---|---|---|
| committer | Bjorn Helgaas <bhelgaas@google.com> | 2012-12-10 16:20:12 -0700 |
| commit | 1cb73f8c479e66541fefd3f7fa547b1fa56cdc54 (patch) | |
| tree | 662259b3d602db1ba4fe203346cc73dff826b2fa /include/linux/pci.h | |
| parent | 3ced69f8bba1b766d6c1ea8f26c32a9b3e6fe75c (diff) | |
| parent | dbd3fc3345390a989a033427aa915a0dfb62149f (diff) | |
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
Diffstat (limited to 'include/linux/pci.h')
| -rw-r--r-- | include/linux/pci.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/linux/pci.h b/include/linux/pci.h index ea41a0a52a5..d11cc6e7999 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 */ }; |