Merge with /pub/scm/linux/kernel/git/torvalds/linux-2.6.git

[linux-2.6-omap-h63xx.git] / drivers / pci / hotplug / rpaphp_pci.c

diff --git a/drivers/pci/hotplug/rpaphp_pci.c b/drivers/pci/hotplug/rpaphp_pci.c
index a7859a84d1ae9a4280435ce3172ef145461e2caf..4b35097b3d9fba0201dca7e2bca9f6fa8eb07dd9 100644 (file)
--- a/drivers/pci/hotplug/rpaphp_pci.c
+++ b/drivers/pci/hotplug/rpaphp_pci.c
@@ -253,7 +253,7 @@ rpaphp_pci_config_slot(struct pci_bus *bus)
        if (!dn || !dn->child)
                return NULL;
 
-       if (systemcfg->platform == PLATFORM_PSERIES_LPAR) {
+       if (_machine == PLATFORM_PSERIES_LPAR) {
                of_scan_bus(dn, bus);
                if (list_empty(&bus->devices)) {
                        err("%s: No new device found\n", __FUNCTION__);