From 4973338b0d412c4c03a5f8d5d9fa7e04f28443e6 Mon Sep 17 00:00:00 2001
From: Bjorn Helgaas <bhelgaas@google.com>
Date: Fri, 28 Oct 2011 16:25:50 -0600
Subject: [PATCH] --- yaml --- r: 283358 b: refs/heads/master c:
 a2ebb827958a4ab3577443f89037f229683c644a h: refs/heads/master v: v3

---
 [refs]                    |  2 +-
 trunk/drivers/pci/probe.c | 15 +++++++++++++++
 trunk/include/linux/pci.h |  3 +++
 3 files changed, 19 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index 55ac04680334..7efd86ad11ac 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 166c6370754a0a92386e2ffb0eeb06e50ac8588d
+refs/heads/master: a2ebb827958a4ab3577443f89037f229683c644a
diff --git a/trunk/drivers/pci/probe.c b/trunk/drivers/pci/probe.c
index 89ecded0581b..7fc7e14118cc 100644
--- a/trunk/drivers/pci/probe.c
+++ b/trunk/drivers/pci/probe.c
@@ -1608,6 +1608,21 @@ struct pci_bus *pci_create_root_bus(struct device *parent, int bus,
 	return NULL;
 }
 
+struct pci_bus * __devinit pci_scan_root_bus(struct device *parent, int bus,
+		struct pci_ops *ops, void *sysdata, struct list_head *resources)
+{
+	struct pci_bus *b;
+
+	b = pci_create_root_bus(parent, bus, ops, sysdata, resources);
+	if (!b)
+		return NULL;
+
+	b->subordinate = pci_scan_child_bus(b);
+	pci_bus_add_devices(b);
+	return b;
+}
+EXPORT_SYMBOL(pci_scan_root_bus);
+
 struct pci_bus *pci_create_bus(struct device *parent,
 		int bus, struct pci_ops *ops, void *sysdata)
 {
diff --git a/trunk/include/linux/pci.h b/trunk/include/linux/pci.h
index eacb1e51e11b..5102d74f6bfc 100644
--- a/trunk/include/linux/pci.h
+++ b/trunk/include/linux/pci.h
@@ -673,6 +673,9 @@ static inline struct pci_bus * __devinit pci_scan_bus(int bus, struct pci_ops *o
 struct pci_bus *pci_create_root_bus(struct device *parent, int bus,
 				    struct pci_ops *ops, void *sysdata,
 				    struct list_head *resources);
+struct pci_bus * __devinit pci_scan_root_bus(struct device *parent, int bus,
+					     struct pci_ops *ops, void *sysdata,
+					     struct list_head *resources);
 struct pci_bus *pci_create_bus(struct device *parent, int bus,
 			       struct pci_ops *ops, void *sysdata);
 struct pci_bus *pci_add_new_bus(struct pci_bus *parent, struct pci_dev *dev,