From 0254053a22d7b40a345d92a428fa46183b922123 Mon Sep 17 00:00:00 2001
From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Thu, 26 Mar 2009 18:34:33 +1100
Subject: [PATCH] --- yaml --- r: 139391 b: refs/heads/master c:
 7bb2cb3e90dc49be1cd14956c155451499c857a7 h: refs/heads/master i:   139389:
 e59380ef133fc70bc4d71e6614eb902d1beed21d   139387:
 04031a8ce920cdc9020b57dd55203282cbe65fe3   139383:
 dd53346cdc5c31b2d82814e851b0232f194f2f4d   139375:
 e80cae4b4b80792f1bb4e1cbb36f122ccf1232e9   139359:
 7cf3a97b32b2565381d2c45186d4355063412fa1   139327:
 f297020a379989b69abb69896db992978f4dd0b2   139263:
 78d0ae86fae40371c332f42aaab3a939df3e8856 v: v3

---
 [refs]                              | 2 +-
 trunk/drivers/pci/hotplug/fakephp.c | 3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index b48c81f27c86..6b4816b14d86 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 7ae0567fd3f4f51d55c4c638ecc6836347992de2
+refs/heads/master: 7bb2cb3e90dc49be1cd14956c155451499c857a7
diff --git a/trunk/drivers/pci/hotplug/fakephp.c b/trunk/drivers/pci/hotplug/fakephp.c
index 2dc7828df480..6151389fd903 100644
--- a/trunk/drivers/pci/hotplug/fakephp.c
+++ b/trunk/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;
 	}