From 86b669f581721b9baab18fb6fd1980d2bad10200 Mon Sep 17 00:00:00 2001
From: Yinghai Lu <yinghai@kernel.org>
Date: Sat, 3 Nov 2012 21:39:30 -0700
Subject: [PATCH] --- yaml --- r: 358392 b: refs/heads/master c:
 b3e65e1f9185a2eb034defe4270ba178ba70b9a9 h: refs/heads/master v: v3

---
 [refs]                    |  2 +-
 trunk/arch/x86/pci/i386.c | 13 +++++++++++++
 2 files changed, 14 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index 77ea08070cf2..dea5951bff06 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 3c449ed0075994b3f3371f8254560428ba787efc
+refs/heads/master: b3e65e1f9185a2eb034defe4270ba178ba70b9a9
diff --git a/trunk/arch/x86/pci/i386.c b/trunk/arch/x86/pci/i386.c
index 8656ea88cf66..94919e307f8e 100644
--- a/trunk/arch/x86/pci/i386.c
+++ b/trunk/arch/x86/pci/i386.c
@@ -352,6 +352,19 @@ static int __init pcibios_assign_resources(void)
 	return 0;
 }
 
+void pcibios_resource_survey_bus(struct pci_bus *bus)
+{
+	dev_printk(KERN_DEBUG, &bus->dev, "Allocating resources\n");
+
+	pcibios_allocate_bus_resources(bus);
+
+	pcibios_allocate_resources(bus, 0);
+	pcibios_allocate_resources(bus, 1);
+
+	if (!(pci_probe & PCI_ASSIGN_ROMS))
+		pcibios_allocate_rom_resources(bus);
+}
+
 void __init pcibios_resource_survey(void)
 {
 	struct pci_bus *bus;