diff options
| author | Linus Torvalds <torvalds@g5.osdl.org> | 2006-03-16 12:13:34 -0500 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-03-16 12:13:34 -0500 |
| commit | 485ff09990416c75ae9593ddc71619939ab9dd51 (patch) | |
| tree | ca5a5681ba24ca74b296af07d5b4269a9564e60b /include | |
| parent | 5466eb5d0ad5e9d4238da71a2a9bd216985a4849 (diff) | |
| parent | 1ae5db3742a0cfaf347231ff0bf181132c64e883 (diff) | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc-merge
* git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc-merge:
powerpc: update defconfigs
[PATCH] powerpc: properly configure DDR/P5IOC children devs
[PATCH] powerpc: remove duplicate EXPORT_SYMBOLS
[PATCH] powerpc: RTC memory corruption
[PATCH] powerpc: enable NAP only on cpus who support it to avoid memory corruption
[PATCH] powerpc: Clarify wording for CRASH_DUMP Kconfig option
[PATCH] powerpc/64: enable CONFIG_BLK_DEV_SL82C105
[PATCH] powerpc: correct cacheflush loop in zImage
powerpc: Fix problem with time going backwards
powerpc: Disallow lparcfg being a module
Diffstat (limited to 'include')
| -rw-r--r-- | include/asm-powerpc/ppc-pci.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/include/asm-powerpc/ppc-pci.h b/include/asm-powerpc/ppc-pci.h index f80482c7231f..cf79bc7ebb55 100644 --- a/include/asm-powerpc/ppc-pci.h +++ b/include/asm-powerpc/ppc-pci.h | |||
| @@ -38,6 +38,7 @@ void *traverse_pci_devices(struct device_node *start, traverse_func pre, | |||
| 38 | 38 | ||
| 39 | void pci_devs_phb_init(void); | 39 | void pci_devs_phb_init(void); |
| 40 | void pci_devs_phb_init_dynamic(struct pci_controller *phb); | 40 | void pci_devs_phb_init_dynamic(struct pci_controller *phb); |
| 41 | int setup_phb(struct device_node *dev, struct pci_controller *phb); | ||
| 41 | void __devinit scan_phb(struct pci_controller *hose); | 42 | void __devinit scan_phb(struct pci_controller *hose); |
| 42 | 43 | ||
| 43 | /* From rtas_pci.h */ | 44 | /* From rtas_pci.h */ |