diff --git a/[refs] b/[refs] index e1a3de787cdd..9b82b661d5bb 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: d22fe808449cd3b5bacd5c0d447e3675f9ab7619 +refs/heads/master: 1de6bf33bc4601d856c286ad5c7d515468e24bbb diff --git a/trunk/arch/x86_64/pci/mmconfig.c b/trunk/arch/x86_64/pci/mmconfig.c index 00d4ddbf980c..b4a3fe4ec249 100644 --- a/trunk/arch/x86_64/pci/mmconfig.c +++ b/trunk/arch/x86_64/pci/mmconfig.c @@ -46,7 +46,7 @@ static char __iomem *get_virt(unsigned int seg, unsigned bus) if (pci_mmcfg_config_num == 1 && cfg->pci_segment_group_number == 0 && (cfg->start_bus_number | cfg->end_bus_number) == 0) - return cfg->base_address; + return pci_mmcfg_virt[0].virt; /* Fall back to type 0 */ return 0;