---

yaml --- r: 316453 b: refs/heads/master c: 06aef8c h: refs/heads/master i: 316451: 6a9b964 v: v3
git-mirror · Jun 13, 2012 · 0ef2aef · 0ef2aef
1 parent 367faf9
commit 0ef2aef
Show file tree

Hide file tree

Showing 3 changed files with 1 addition and 17 deletions.
diff --git 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
@@ -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
@@ -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);