summaryrefslogtreecommitdiffstats
path: root/drivers/pci
diff options
context:
space:
mode:
authorBjorn Helgaas <bhelgaas@google.com>2012-12-10 16:20:12 -0700
committerBjorn Helgaas <bhelgaas@google.com>2012-12-10 16:20:12 -0700
commit1cb73f8c479e66541fefd3f7fa547b1fa56cdc54 (patch)
tree662259b3d602db1ba4fe203346cc73dff826b2fa /drivers/pci
parent3ced69f8bba1b766d6c1ea8f26c32a9b3e6fe75c (diff)
parentdbd3fc3345390a989a033427aa915a0dfb62149f (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 'drivers/pci')
-rw-r--r--drivers/pci/rom.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/pci/rom.c b/drivers/pci/rom.c
index 3a3828fbc87..ab886b7ee32 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