From 9c8dc44f5e81e5dd44606d637df0b443c938782f Mon Sep 17 00:00:00 2001 From: Ralf Baechle Date: Tue, 11 Dec 2007 19:49:24 +0000 Subject: [PATCH] --- yaml --- r: 74853 b: refs/heads/master c: d20e47e153dcfddca5a066ff0f8da2d1104d08ea h: refs/heads/master i: 74851: 9fcc51b9a452f479b1ee131742624ab29ac4b10f v: v3 --- [refs] | 2 +- trunk/arch/mips/pci/pci.c | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/[refs] b/[refs] index 75671dcf3def..25be2faeb586 100644 --- 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 index 589b745d822a..6e6981fd7934 100644 --- 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)