Merge branch 'master'

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

diff --git a/drivers/pci/hotplug/acpiphp_glue.c b/drivers/pci/hotplug/acpiphp_glue.c
index 424e7de181aed457457374830ea059c3be1833fa..8e21f6ab89a15453fd1aacb558f119e70fe3e96a 100644 (file)
--- a/drivers/pci/hotplug/acpiphp_glue.c
+++ b/drivers/pci/hotplug/acpiphp_glue.c
@@ -58,6 +58,9 @@ static LIST_HEAD(bridge_list);
 
 static void handle_hotplug_event_bridge (acpi_handle, u32, void *);
 static void handle_hotplug_event_func (acpi_handle, u32, void *);
+static void acpiphp_sanitize_bus(struct pci_bus *bus);
+static void acpiphp_set_hpp_values(acpi_handle handle, struct pci_bus *bus);
+
 
 /*
  * initialization & terminatation routines
@@ -796,8 +799,13 @@ static int enable_device(struct acpiphp_slot *slot)
                }
        }
 
+       pci_bus_size_bridges(bus);
        pci_bus_assign_resources(bus);
+       acpiphp_sanitize_bus(bus);
+       pci_enable_bridges(bus);
        pci_bus_add_devices(bus);
+       acpiphp_set_hpp_values(DEVICE_ACPI_HANDLE(&bus->self->dev), bus);
+       acpiphp_configure_ioapics(DEVICE_ACPI_HANDLE(&bus->self->dev));
 
        /* associate pci_dev to our representation */
        list_for_each (l, &slot->funcs) {