Automatic merge of /spare/repo/netdev-2.6 branch starfire

[linux-2.6] / drivers / pci / hotplug / shpchprm_acpi.c

diff --git a/drivers/pci/hotplug/shpchprm_acpi.c b/drivers/pci/hotplug/shpchprm_acpi.c
index 18aa65a206a62b664060e10f5e26b7a985db4000..7957cdc72cd0464869096ffe9b59298953fdc539 100644 (file)
--- a/drivers/pci/hotplug/shpchprm_acpi.c
+++ b/drivers/pci/hotplug/shpchprm_acpi.c
@@ -1681,7 +1681,7 @@ void shpchprm_enable_card(
                | PCI_COMMAND_IO | PCI_COMMAND_MEMORY;
        bcmd = bcommand  = bcommand | PCI_BRIDGE_CTL_NO_ISA;
 
-       ab = find_acpi_bridge_by_bus(acpi_bridges_head, ctrl->seg, ctrl->bus);
+       ab = find_acpi_bridge_by_bus(acpi_bridges_head, ctrl->seg, ctrl->slot_bus);
        if (ab) {
                if (ab->_hpp) {
                        if (ab->_hpp->enable_perr) {