aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/pci
diff options
context:
space:
mode:
authorStephen Rothwell <sfr@canb.auug.org.au>2009-03-26 03:34:33 -0400
committerJesse Barnes <jbarnes@virtuousgeek.org>2009-03-26 19:00:34 -0400
commit7bb2cb3e90dc49be1cd14956c155451499c857a7 (patch)
treea3c2c0bcbb08db9b3026f8b37fb50b7ce419d91f /drivers/pci
parent7ae0567fd3f4f51d55c4c638ecc6836347992de2 (diff)
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>
Diffstat (limited to 'drivers/pci')
-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 @@
18#include <linux/sysfs.h> 18#include <linux/sysfs.h>
19#include <linux/init.h> 19#include <linux/init.h>
20#include <linux/pci.h> 20#include <linux/pci.h>
21#include <linux/device.h>
21#include "../pci.h" 22#include "../pci.h"
22 23
23struct legacy_slot { 24struct legacy_slot {
@@ -88,7 +89,7 @@ static int legacy_add_slot(struct pci_dev *pdev)
88 89
89 if (kobject_init_and_add(&slot->kobj, &legacy_ktype, 90 if (kobject_init_and_add(&slot->kobj, &legacy_ktype,
90 &pci_slots_kset->kobj, "%s", 91 &pci_slots_kset->kobj, "%s",
91 pdev->dev.bus_id)) { 92 dev_name(&pdev->dev))) {
92 dev_warn(&pdev->dev, "Failed to created legacy fake slot\n"); 93 dev_warn(&pdev->dev, "Failed to created legacy fake slot\n");
93 return -EINVAL; 94 return -EINVAL;
94 } 95 }