summaryrefslogtreecommitdiff
path: root/arch/x86/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 /arch/x86/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 'arch/x86/pci')
-rw-r--r--arch/x86/pci/common.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/x86/pci/common.c b/arch/x86/pci/common.c
index 6a6b01778dab..1b1dda90a945 100644
--- a/arch/x86/pci/common.c
+++ b/arch/x86/pci/common.c
@@ -628,8 +628,8 @@ int pcibios_add_device(struct pci_dev *dev)
(PCI_FUNC(dev->devfn) == rom->function) &&
(dev->vendor == rom->vendor) &&
(dev->device == rom->devid)) {
- dev->rom = (void *)(unsigned long)(pa_data +
- offsetof(struct pci_setup_rom, romdata));
+ dev->rom = pa_data +
+ offsetof(struct pci_setup_rom, romdata);
dev->romlen = rom->pcilen;
}
}