Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-2.6

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

diff --git a/drivers/pci/slot.c b/drivers/pci/slot.c
index b6ee352ae459939c3c7063f83d5fb87dff8ca52f..4dd1c3e157aec6d6c136c02255faed19d46c3dc1 100644 (file)
--- a/drivers/pci/slot.c
+++ b/drivers/pci/slot.c
@@ -121,7 +121,7 @@ static int rename_slot(struct pci_slot *slot, const char *name)
        int result = 0;
        char *slot_name;
 
-       if (strcmp(kobject_name(&slot->kobj), name) == 0)
+       if (strcmp(pci_slot_name(slot), name) == 0)
                return result;
 
        slot_name = make_slot_name(name);