Merge master.kernel.org:/pub/scm/linux/kernel/git/acme/net-2.6

[linux-2.6] / include / asm-arm / pci.h

diff --git a/include/asm-arm/pci.h b/include/asm-arm/pci.h
index b28f1c95dd625a7b277cb279a585332cb5a1fe3c..ead3ced38cb8f4aa2b20cae06d982291f5dbeb6a 100644 (file)
--- a/include/asm-arm/pci.h
+++ b/include/asm-arm/pci.h
@@ -60,6 +60,23 @@ extern void
 pcibios_resource_to_bus(struct pci_dev *dev, struct pci_bus_region *region,
                         struct resource *res);
 
+extern void
+pcibios_bus_to_resource(struct pci_dev *dev, struct resource *res,
+                       struct pci_bus_region *region);
+
+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;
+}
+
 static inline void pcibios_add_platform_entries(struct pci_dev *dev)
 {
 }