summaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
authorStephen Rothwell <sfr@canb.auug.org.au>2009-07-20 11:04:43 +1000
committerStephen Rothwell <sfr@canb.auug.org.au>2009-07-20 11:04:43 +1000
commitd3e19fdbf10b1622fe59bf945f0f4109af7729e6 (patch)
tree320043830e8756fc0786fb0845d9d79a9a8973f3 /include
parent1931514f178ad83db3d58ea68cd4477dca32103b (diff)
parentacccaba4ba63b890eb1e12211a31295736e63167 (diff)
Merge commit 'pci/linux-next'
Diffstat (limited to 'include')
-rw-r--r--include/asm-generic/pci.h13
1 files changed, 12 insertions, 1 deletions
diff --git a/include/asm-generic/pci.h b/include/asm-generic/pci.h
index b4326b5466eb..26373cff4546 100644
--- a/include/asm-generic/pci.h
+++ b/include/asm-generic/pci.h
@@ -30,7 +30,18 @@ pcibios_bus_to_resource(struct pci_dev *dev, struct resource *res,
res->end = region->end;
}
-#define pcibios_scan_all_fns(a, b) 0
+static inline struct resource *
+pcibios_select_root(struct pci_dev *pdev, struct resource *res)
+{
+ struct resource *root = NULL;
+
+ if (res->flags & IORESOURCE_IO)
+ root = &ioport_resource;
+ if (res->flags & IORESOURCE_MEM)
+ root = &iomem_resource;
+
+ return root;
+}
#ifndef HAVE_ARCH_PCI_GET_LEGACY_IDE_IRQ
static inline int pci_get_legacy_ide_irq(struct pci_dev *dev, int channel)