Pull video into release branch

[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 6271be8b155e31834696c4d668dde53a52dd8daf..54ca8650d5110e7f6736e6792782b966fc4f1dae 100644 (file)
--- a/drivers/pci/hotplug/rpaphp_pci.c
+++ b/drivers/pci/hotplug/rpaphp_pci.c
@@ -77,7 +77,15 @@ static void set_slot_name(struct slot *slot)
                        bus->number);
 }
 
-int rpaphp_register_pci_slot(struct slot *slot)
+/**
+ * rpaphp_enable_slot - record slot state, config pci device
+ *
+ * Initialize values in the slot, and the hotplug_slot info
+ * structures to indicate if there is a pci card plugged into
+ * the slot. If the slot is not empty, run the pcibios routine
+ * to get pcibios stuff correctly set up.
+ */
+int rpaphp_enable_slot(struct slot *slot)
 {
        int rc, level, state;
        struct pci_bus *bus;
@@ -136,6 +144,6 @@ int rpaphp_register_pci_slot(struct slot *slot)
                }
        }
 
-       return rpaphp_register_slot(slot);
+       return 0;
 }