diff options
author | Linus Torvalds <torvalds@g5.osdl.org> | 2005-09-09 13:38:02 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@g5.osdl.org> | 2005-09-09 13:38:02 -0400 |
commit | 3aed77bc84013fced136977b7cc17fff60eddf7a (patch) | |
tree | 75ee4060f58f033deb16771a303fb55dd370b6f9 /arch/ppc64/kernel/pci.h | |
parent | 0b968d23610d65a46299347b141a687e207bd294 (diff) | |
parent | b2ad7b5e8115582cdf5bbda065aa516c24d62c21 (diff) |
Merge master.kernel.org:/pub/scm/linux/kernel/git/paulus/ppc64-2.6
Diffstat (limited to 'arch/ppc64/kernel/pci.h')
-rw-r--r-- | arch/ppc64/kernel/pci.h | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/arch/ppc64/kernel/pci.h b/arch/ppc64/kernel/pci.h index 26be78b13af1..5eb2cc320566 100644 --- a/arch/ppc64/kernel/pci.h +++ b/arch/ppc64/kernel/pci.h | |||
@@ -34,7 +34,6 @@ void *traverse_pci_devices(struct device_node *start, traverse_func pre, | |||
34 | 34 | ||
35 | void pci_devs_phb_init(void); | 35 | void pci_devs_phb_init(void); |
36 | void pci_devs_phb_init_dynamic(struct pci_controller *phb); | 36 | void pci_devs_phb_init_dynamic(struct pci_controller *phb); |
37 | struct device_node *fetch_dev_dn(struct pci_dev *dev); | ||
38 | 37 | ||
39 | /* PCI address cache management routines */ | 38 | /* PCI address cache management routines */ |
40 | void pci_addr_cache_insert_device(struct pci_dev *dev); | 39 | void pci_addr_cache_insert_device(struct pci_dev *dev); |