diff options
| author | Ingo Molnar <mingo@elte.hu> | 2008-11-03 02:57:41 -0500 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2008-11-03 02:57:41 -0500 |
| commit | db5935001a43528e673ad26ffec9d98c60a496a9 (patch) | |
| tree | 8e735327a97beccabb5d94ef93df25d2bacda705 /arch/powerpc/include/asm/pci.h | |
| parent | 34f3a814eef8069a24e5b3ebcf27aba9dabac2ea (diff) | |
| parent | 45beca08dd8b6d6a65c5ffd730af2eac7a2c7a03 (diff) | |
Merge commit 'v2.6.28-rc3' into sched/core
Diffstat (limited to 'arch/powerpc/include/asm/pci.h')
| -rw-r--r-- | arch/powerpc/include/asm/pci.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/arch/powerpc/include/asm/pci.h b/arch/powerpc/include/asm/pci.h index 39d547fde956..57a2a494886b 100644 --- a/arch/powerpc/include/asm/pci.h +++ b/arch/powerpc/include/asm/pci.h | |||
| @@ -208,6 +208,8 @@ extern void pcibios_setup_new_device(struct pci_dev *dev); | |||
| 208 | 208 | ||
| 209 | extern void pcibios_claim_one_bus(struct pci_bus *b); | 209 | extern void pcibios_claim_one_bus(struct pci_bus *b); |
| 210 | 210 | ||
| 211 | extern void pcibios_allocate_bus_resources(struct pci_bus *bus); | ||
| 212 | |||
| 211 | extern void pcibios_resource_survey(void); | 213 | extern void pcibios_resource_survey(void); |
| 212 | 214 | ||
| 213 | extern struct pci_controller *init_phb_dynamic(struct device_node *dn); | 215 | extern struct pci_controller *init_phb_dynamic(struct device_node *dn); |