diff options
| author | Paul Mackerras <paulus@samba.org> | 2008-01-23 23:29:14 -0500 |
|---|---|---|
| committer | Paul Mackerras <paulus@samba.org> | 2008-01-23 23:29:14 -0500 |
| commit | dcb571be2019ae677bc5ed64437dbc87ae1eb67f (patch) | |
| tree | 1b93f9ea3568be4dcc49ffb2adc0d3ab0a02b47f /include/asm-powerpc/pci-bridge.h | |
| parent | 9156ad48338e0306e508ead5c0d9986050744475 (diff) | |
| parent | 96f39c1718091d63dc1c5012d566737ea0d2a20c (diff) | |
Merge branch 'for-2.6.25' of master.kernel.org:/pub/scm/linux/kernel/git/galak/powerpc into for-2.6.25
Diffstat (limited to 'include/asm-powerpc/pci-bridge.h')
| -rw-r--r-- | include/asm-powerpc/pci-bridge.h | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/include/asm-powerpc/pci-bridge.h b/include/asm-powerpc/pci-bridge.h index a6ea49eb680b..e5802c62f428 100644 --- a/include/asm-powerpc/pci-bridge.h +++ b/include/asm-powerpc/pci-bridge.h | |||
| @@ -152,9 +152,6 @@ extern void setup_indirect_pci(struct pci_controller* hose, | |||
| 152 | resource_size_t cfg_addr, | 152 | resource_size_t cfg_addr, |
| 153 | resource_size_t cfg_data, u32 flags); | 153 | resource_size_t cfg_data, u32 flags); |
| 154 | extern void setup_grackle(struct pci_controller *hose); | 154 | extern void setup_grackle(struct pci_controller *hose); |
| 155 | extern void __init update_bridge_resource(struct pci_dev *dev, | ||
| 156 | struct resource *res); | ||
| 157 | |||
| 158 | #else /* CONFIG_PPC64 */ | 155 | #else /* CONFIG_PPC64 */ |
| 159 | 156 | ||
| 160 | /* | 157 | /* |