diff options
| author | Russell King <rmk+kernel@arm.linux.org.uk> | 2010-07-27 10:42:48 +0100 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2010-07-27 10:42:52 +0100 |
| commit | 4708ac49305bbcd511600d4af71a4c6dca15af65 (patch) | |
| tree | 77ba5c83a7d4f4a119e3fd524d82adc297df1e35 /arch/sh/drivers/pci/pci.c | |
| parent | 1dbd30e9890fd69e50b17edd70ca583546b0fe4e (diff) | |
| parent | 2f7989efd4398d92b8adffce2e07dd043a0895fe (diff) | |
Merge branch 'origin' into misc
Diffstat (limited to 'arch/sh/drivers/pci/pci.c')
| -rw-r--r-- | arch/sh/drivers/pci/pci.c | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/arch/sh/drivers/pci/pci.c b/arch/sh/drivers/pci/pci.c index 953af139e23..1e9598d2bbf 100644 --- a/arch/sh/drivers/pci/pci.c +++ b/arch/sh/drivers/pci/pci.c @@ -139,8 +139,6 @@ 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) |