diff options
author | Linus Torvalds <torvalds@ppc970.osdl.org> | 2005-06-23 09:49:55 -0700 |
---|---|---|
committer | Linus Torvalds <torvalds@ppc970.osdl.org> | 2005-06-23 09:49:55 -0700 |
commit | 24665cd00dd06c741ef6268515ca9e6d3cda5c57 (patch) | |
tree | d55e925db2b78bc6529965fa6b1df07a76b56610 /arch/ppc64/kernel/pci.h | |
parent | fed2fc18a4567d613cd35115322257c6c6c710e9 (diff) | |
parent | d7152fe14cad075d6dd4ee4194acd131aed0244e (diff) | |
download | op-kernel-dev-24665cd00dd06c741ef6268515ca9e6d3cda5c57.zip op-kernel-dev-24665cd00dd06c741ef6268515ca9e6d3cda5c57.tar.gz |
Merge rsync://rsync.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 | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/arch/ppc64/kernel/pci.h b/arch/ppc64/kernel/pci.h index 0fd7d84..26be78b 100644 --- a/arch/ppc64/kernel/pci.h +++ b/arch/ppc64/kernel/pci.h @@ -40,10 +40,14 @@ struct device_node *fetch_dev_dn(struct pci_dev *dev); void pci_addr_cache_insert_device(struct pci_dev *dev); void pci_addr_cache_remove_device(struct pci_dev *dev); -/* From pSeries_pci.h */ +/* From rtas_pci.h */ void init_pci_config_tokens (void); unsigned long get_phb_buid (struct device_node *); +/* From pSeries_pci.h */ +extern void pSeries_final_fixup(void); +extern void pSeries_irq_bus_setup(struct pci_bus *bus); + extern unsigned long pci_probe_only; extern unsigned long pci_assign_all_buses; extern int pci_read_irq_line(struct pci_dev *pci_dev); |