From 37e6885fe58a20b9c794872b204c85ea387cf18b Mon Sep 17 00:00:00 2001
From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Thu, 8 May 2008 18:41:48 -0700
Subject: [PATCH] --- yaml --- r: 96190 b: refs/heads/master c:
 8d539108560ec121d59eee05160236488266221c h: refs/heads/master v: v3

---
 [refs]                      |  2 +-
 trunk/arch/x86/pci/common.c | 17 -----------------
 2 files changed, 1 insertion(+), 18 deletions(-)

diff --git a/[refs] b/[refs]
index a51454960cb6..86ce689c5e34 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: c4f51b4662074c6ee26c972126a317c05f65be06
+refs/heads/master: 8d539108560ec121d59eee05160236488266221c
diff --git a/trunk/arch/x86/pci/common.c b/trunk/arch/x86/pci/common.c
index bfa72a9475b3..8545c8a9d107 100644
--- a/trunk/arch/x86/pci/common.c
+++ b/trunk/arch/x86/pci/common.c
@@ -77,19 +77,6 @@ int pcibios_scanned;
  */
 DEFINE_SPINLOCK(pci_config_lock);
 
-static void __devinit pcibios_fixup_device_resources(struct pci_dev *dev)
-{
-	struct resource *rom_r = &dev->resource[PCI_ROM_RESOURCE];
-
-	if (rom_r->parent)
-		return;
-	if (rom_r->start)
-		/* we deal with BIOS assigned ROM later */
-		return;
-	if (!(pci_probe & PCI_ASSIGN_ROMS))
-		rom_r->start = rom_r->end = rom_r->flags = 0;
-}
-
 static int __devinit can_skip_ioresource_align(const struct dmi_system_id *d)
 {
 	pci_probe |= PCI_CAN_SKIP_ISA_ALIGN;
@@ -141,11 +128,7 @@ void __init dmi_check_skip_isa_align(void)
 
 void __devinit  pcibios_fixup_bus(struct pci_bus *b)
 {
-	struct pci_dev *dev;
-
 	pci_read_bridge_bases(b);
-	list_for_each_entry(dev, &b->devices, bus_list)
-		pcibios_fixup_device_resources(dev);
 }
 
 /*