From d1a37afbf8e90c006c376d2f2a29825dc752b21e Mon Sep 17 00:00:00 2001
From: Sam Ravnborg <sam@ravnborg.org>
Date: Sat, 2 Feb 2008 22:32:23 +0100
Subject: [PATCH] --- yaml --- r: 82617 b: refs/heads/master c:
 4105717bc98ba01663ff28f8a16d8716ba9d07fe h: refs/heads/master i:   82615:
 958479ee394808e269534cfa8df4e3b49b3ba0cf v: v3

---
 [refs]                          |  2 +-
 trunk/drivers/pci/Makefile      |  3 +++
 trunk/drivers/pci/hotplug-pci.c | 20 ++++++++++++++++++++
 trunk/drivers/pci/probe.c       | 15 ---------------
 4 files changed, 24 insertions(+), 16 deletions(-)
 create mode 100644 trunk/drivers/pci/hotplug-pci.c

diff --git a/[refs] b/[refs]
index 93970238885b..b733f73b8c2c 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: d5f78fb0c8ab7f929f94fa4087a2397ac8d29a30
+refs/heads/master: 4105717bc98ba01663ff28f8a16d8716ba9d07fe
diff --git a/trunk/drivers/pci/Makefile b/trunk/drivers/pci/Makefile
index f697f3d728eb..9f04d17576d6 100644
--- a/trunk/drivers/pci/Makefile
+++ b/trunk/drivers/pci/Makefile
@@ -13,6 +13,9 @@ obj-$(CONFIG_HOTPLUG) += hotplug.o
 
 # Build the PCI Hotplug drivers if we were asked to
 obj-$(CONFIG_HOTPLUG_PCI) += hotplug/
+ifdef CONFIG_HOTPLUG_PCI
+obj-y += hotplug-pci.o
+endif
 
 # Build the PCI MSI interrupt support
 obj-$(CONFIG_PCI_MSI) += msi.o
diff --git a/trunk/drivers/pci/hotplug-pci.c b/trunk/drivers/pci/hotplug-pci.c
new file mode 100644
index 000000000000..a590ef682153
--- /dev/null
+++ b/trunk/drivers/pci/hotplug-pci.c
@@ -0,0 +1,20 @@
+/* Core PCI functionality used only by PCI hotplug */
+
+#include <linux/pci.h>
+#include "pci.h"
+
+
+unsigned int pci_do_scan_bus(struct pci_bus *bus)
+{
+	unsigned int max;
+
+	max = pci_scan_child_bus(bus);
+
+	/*
+	 * Make the discovered devices available.
+	 */
+	pci_bus_add_devices(bus);
+
+	return max;
+}
+EXPORT_SYMBOL(pci_do_scan_bus);
diff --git a/trunk/drivers/pci/probe.c b/trunk/drivers/pci/probe.c
index 34fa0397b55d..3bb2bc2a1e70 100644
--- a/trunk/drivers/pci/probe.c
+++ b/trunk/drivers/pci/probe.c
@@ -1040,20 +1040,6 @@ unsigned int pci_scan_child_bus(struct pci_bus *bus)
 	return max;
 }
 
-unsigned int __devinit pci_do_scan_bus(struct pci_bus *bus)
-{
-	unsigned int max;
-
-	max = pci_scan_child_bus(bus);
-
-	/*
-	 * Make the discovered devices available.
-	 */
-	pci_bus_add_devices(bus);
-
-	return max;
-}
-
 struct pci_bus * pci_create_bus(struct device *parent,
 		int bus, struct pci_ops *ops, void *sysdata)
 {
@@ -1140,7 +1126,6 @@ EXPORT_SYMBOL(pci_scan_bus_parented);
 
 #ifdef CONFIG_HOTPLUG
 EXPORT_SYMBOL(pci_add_new_bus);
-EXPORT_SYMBOL(pci_do_scan_bus);
 EXPORT_SYMBOL(pci_scan_slot);
 EXPORT_SYMBOL(pci_scan_bridge);
 EXPORT_SYMBOL_GPL(pci_scan_child_bus);