diff options
| author | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2013-02-19 12:51:39 -0500 |
|---|---|---|
| committer | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2013-02-19 12:51:39 -0500 |
| commit | 877d66856e9de4a6d1ffbf61bec6f830bde4d3bf (patch) | |
| tree | 61249ed3466942867666af42c44044ff1e83fdc5 /arch/powerpc/sysdev/fsl_pci.h | |
| parent | db8ff907027b63b02c8cef385ea95445b7a41357 (diff) | |
| parent | 12c7e8f62de546bff9f8ffa5a03e0ad292bcf17d (diff) | |
Merge remote-tracking branch 'kumar/next' into next
<<
Mostly misc code cleanups in various board ports and adding support for a
new MPC85xx board - ppa8548.
>>
Diffstat (limited to 'arch/powerpc/sysdev/fsl_pci.h')
| -rw-r--r-- | arch/powerpc/sysdev/fsl_pci.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/powerpc/sysdev/fsl_pci.h b/arch/powerpc/sysdev/fsl_pci.h index d078537adece..c495c00c8740 100644 --- a/arch/powerpc/sysdev/fsl_pci.h +++ b/arch/powerpc/sysdev/fsl_pci.h | |||
| @@ -91,7 +91,7 @@ struct ccsr_pci { | |||
| 91 | __be32 pex_err_cap_r3; /* 0x.e34 - PCIE error capture register 0 */ | 91 | __be32 pex_err_cap_r3; /* 0x.e34 - PCIE error capture register 0 */ |
| 92 | }; | 92 | }; |
| 93 | 93 | ||
| 94 | extern int fsl_add_bridge(struct device_node *dev, int is_primary); | 94 | extern int fsl_add_bridge(struct platform_device *pdev, int is_primary); |
| 95 | extern void fsl_pcibios_fixup_bus(struct pci_bus *bus); | 95 | extern void fsl_pcibios_fixup_bus(struct pci_bus *bus); |
| 96 | extern int mpc83xx_add_bridge(struct device_node *dev); | 96 | extern int mpc83xx_add_bridge(struct device_node *dev); |
| 97 | u64 fsl_pci_immrbar_base(struct pci_controller *hose); | 97 | u64 fsl_pci_immrbar_base(struct pci_controller *hose); |