diff options
author | Linus Torvalds <torvalds@g5.osdl.org> | 2005-09-08 18:55:23 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@g5.osdl.org> | 2005-09-08 18:55:23 -0400 |
commit | 7bbedd521310547ca73cc77adcf61fb85723adc3 (patch) | |
tree | f759d90c46bfbc48a9f396c9c6f839da11cdc6aa /include/asm-sparc64 | |
parent | f44702f49056c203341badaa2cb8a706160d9119 (diff) | |
parent | a04ce0ffcaf561994ecf382cd3caad75556dc499 (diff) |
Merge master.kernel.org:/pub/scm/linux/kernel/git/gregkh/pci-2.6
Diffstat (limited to 'include/asm-sparc64')
-rw-r--r-- | include/asm-sparc64/pci.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/include/asm-sparc64/pci.h b/include/asm-sparc64/pci.h index a4ab0ec7143a..89bd71b1c0d8 100644 --- a/include/asm-sparc64/pci.h +++ b/include/asm-sparc64/pci.h | |||
@@ -269,6 +269,8 @@ extern void | |||
269 | pcibios_bus_to_resource(struct pci_dev *dev, struct resource *res, | 269 | pcibios_bus_to_resource(struct pci_dev *dev, struct resource *res, |
270 | struct pci_bus_region *region); | 270 | struct pci_bus_region *region); |
271 | 271 | ||
272 | extern struct resource *pcibios_select_root(struct pci_dev *, struct resource *); | ||
273 | |||
272 | static inline void pcibios_add_platform_entries(struct pci_dev *dev) | 274 | static inline void pcibios_add_platform_entries(struct pci_dev *dev) |
273 | { | 275 | { |
274 | } | 276 | } |