---

yaml --- r: 74853 b: refs/heads/master c: d20e47e h: refs/heads/master i: 74851: 9fcc51b v: v3
git-mirror · Dec 14, 2007 · 9c8dc44 · 9c8dc44
1 parent 031aa53
commit 9c8dc44
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 1 deletion.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 40c7869b693b18412491fdcff64682215b739f9e
+refs/heads/master: d20e47e153dcfddca5a066ff0f8da2d1104d08ea
diff --git a/trunk/arch/mips/pci/pci.c b/trunk/arch/mips/pci/pci.c
@@ -242,6 +242,8 @@ static void pcibios_fixup_device_resources(struct pci_dev *dev,
 	for (i = 0; i < PCI_NUM_RESOURCES; i++) {
 		if (!dev->resource[i].start)
 			continue;
+		if (dev->resource[i].flags & IORESOURCE_PCI_FIXED)
+			continue;
 		if (dev->resource[i].flags & IORESOURCE_IO)
 			offset = hose->io_offset;
 		else if (dev->resource[i].flags & IORESOURCE_MEM)