From 0ef2aef335ee5434f0b86af9aa4f4ba04790d6e4 Mon Sep 17 00:00:00 2001
From: Yinghai Lu <yinghai@kernel.org>
Date: Thu, 17 May 2012 18:58:41 -0700
Subject: [PATCH] --- yaml --- r: 316453 b: refs/heads/master c:
 06aef8cec7563c40c7d7501d13ec1ed12f5e495b h: refs/heads/master i:   316451:
 6a9b964a2b304a24d6c89850f501e5168a822e09 v: v3

---
 [refs]                          |  2 +-
 trunk/drivers/pci/hotplug-pci.c | 15 ---------------
 trunk/drivers/pci/pci.h         |  1 -
 3 files changed, 1 insertion(+), 17 deletions(-)

diff --git a/[refs] b/[refs]
index dc44f70dbbdc..efe5c2ed2c26 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 69ba29b9f91317b0cb8a4891c0cc6270a6f77ec9
+refs/heads/master: 06aef8cec7563c40c7d7501d13ec1ed12f5e495b
diff --git a/trunk/drivers/pci/hotplug-pci.c b/trunk/drivers/pci/hotplug-pci.c
index 44088c4fe687..6258dc260d9f 100644
--- a/trunk/drivers/pci/hotplug-pci.c
+++ b/trunk/drivers/pci/hotplug-pci.c
@@ -27,18 +27,3 @@ int __ref pci_hp_add_bridge(struct pci_dev *dev)
 	return 0;
 }
 EXPORT_SYMBOL_GPL(pci_hp_add_bridge);
-
-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;
-}
-EXPORT_SYMBOL(pci_do_scan_bus);
diff --git a/trunk/drivers/pci/pci.h b/trunk/drivers/pci/pci.h
index f3e14ce8eab7..1c56ea8110b1 100644
--- a/trunk/drivers/pci/pci.h
+++ b/trunk/drivers/pci/pci.h
@@ -125,7 +125,6 @@ static inline int pci_proc_detach_bus(struct pci_bus *bus) { return 0; }
 
 /* Functions for PCI Hotplug drivers to use */
 int pci_hp_add_bridge(struct pci_dev *dev);
-extern unsigned int pci_do_scan_bus(struct pci_bus *bus);
 
 #ifdef HAVE_PCI_LEGACY
 extern void pci_create_legacy_files(struct pci_bus *bus);