summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorStephen Rothwell <sfr@canb.auug.org.au>2009-03-26 08:34:33 +0100
committerJesse Barnes <jbarnes@virtuousgeek.org>2009-03-27 00:00:34 +0100
commit7bb2cb3e90dc49be1cd14956c155451499c857a7 (patch)
treea3c2c0bcbb08db9b3026f8b37fb50b7ce419d91f
parentPCI: fix kernel oops on bridge removal (diff)
downloadlinux-7bb2cb3e90dc49be1cd14956c155451499c857a7.tar.xz
linux-7bb2cb3e90dc49be1cd14956c155451499c857a7.zip
PCI: update fakephp for bus_id removal
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>
-rw-r--r--drivers/pci/hotplug/fakephp.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/pci/hotplug/fakephp.c b/drivers/pci/hotplug/fakephp.c
index 2dc7828df480..6151389fd903 100644
--- a/drivers/pci/hotplug/fakephp.c
+++ b/drivers/pci/hotplug/fakephp.c
@@ -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;
}