]> bbs.cooldavid.org Git - net-next-2.6.git/commitdiff
PCI: update fakephp for bus_id removal
authorStephen Rothwell <sfr@canb.auug.org.au>
Thu, 26 Mar 2009 07:34:33 +0000 (18:34 +1100)
committerJesse Barnes <jbarnes@virtuousgeek.org>
Thu, 26 Mar 2009 23:00:34 +0000 (16:00 -0700)
Get rid of a new use of bus_id that snuck in.

Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
Signed-off-by: Jesse Barnes <jbarnes@virtuousgeek.org>
drivers/pci/hotplug/fakephp.c

index 2dc7828df480dcc6b1b76a5d2a18c0419c3d1214..6151389fd90304d1b02b364150432d8d3e17bb34 100644 (file)
@@ -18,6 +18,7 @@
 #include <linux/sysfs.h>
 #include <linux/init.h>
 #include <linux/pci.h>
+#include <linux/device.h>
 #include "../pci.h"
 
 struct legacy_slot {
@@ -88,7 +89,7 @@ static int legacy_add_slot(struct pci_dev *pdev)
 
        if (kobject_init_and_add(&slot->kobj, &legacy_ktype,
                                 &pci_slots_kset->kobj, "%s",
-                                pdev->dev.bus_id)) {
+                                dev_name(&pdev->dev))) {
                dev_warn(&pdev->dev, "Failed to created legacy fake slot\n");
                return -EINVAL;
        }