summaryrefslogtreecommitdiffstats
path: root/include/asm-ppc/pci.h
diff options
context:
space:
mode:
authorJeff Garzik <jgarzik@pobox.com>2005-08-15 05:10:00 +0200
committerJeff Garzik <jgarzik@pobox.com>2005-08-15 05:10:00 +0200
commit4c0e176dd5e4c44dd60f398518f75eedbe1a65f3 (patch)
tree07aea7539f78f221c6fc535a94a07befa2afdb63 /include/asm-ppc/pci.h
parent[PATCH] ieee80211: Fix frame control pver mask (diff)
parentRevert PCIBIOS_MIN_IO changes for 2.6.13 (diff)
downloadlinux-4c0e176dd5e4c44dd60f398518f75eedbe1a65f3.tar.xz
linux-4c0e176dd5e4c44dd60f398518f75eedbe1a65f3.zip
Merge /spare/repo/linux-2.6/
Diffstat (limited to 'include/asm-ppc/pci.h')
-rw-r--r--include/asm-ppc/pci.h4
1 files changed, 4 insertions, 0 deletions
diff --git a/include/asm-ppc/pci.h b/include/asm-ppc/pci.h
index a13d55870e62..a811e440c978 100644
--- a/include/asm-ppc/pci.h
+++ b/include/asm-ppc/pci.h
@@ -105,6 +105,10 @@ 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);
+
extern void pcibios_add_platform_entries(struct pci_dev *dev);
struct file;