diff options
| author | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2009-01-05 14:16:48 +1100 |
|---|---|---|
| committer | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2009-01-05 14:16:48 +1100 |
| commit | 4aa12f7b927c3cac0e0cf3503642597527d0ece0 (patch) | |
| tree | d327446284dcce52ad3ea54ffe8a7dddfcb8b86d /arch/powerpc/sysdev/fsl_pci.c | |
| parent | b58602a4bac012b5f4fc12fe6b46ab237b610d5d (diff) | |
| parent | 068e8c9d02ee37c44a4d65279b3ae8188fb09e18 (diff) | |
| download | lwn-4aa12f7b927c3cac0e0cf3503642597527d0ece0.tar.gz lwn-4aa12f7b927c3cac0e0cf3503642597527d0ece0.zip | |
Merge commit 'kumar/kumar-next' into next
Diffstat (limited to 'arch/powerpc/sysdev/fsl_pci.c')
| -rw-r--r-- | arch/powerpc/sysdev/fsl_pci.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/arch/powerpc/sysdev/fsl_pci.c b/arch/powerpc/sysdev/fsl_pci.c index d5f9ae0f1b75..f611d0369cc8 100644 --- a/arch/powerpc/sysdev/fsl_pci.c +++ b/arch/powerpc/sysdev/fsl_pci.c @@ -29,7 +29,8 @@ #if defined(CONFIG_PPC_85xx) || defined(CONFIG_PPC_86xx) /* atmu setup for fsl pci/pcie controller */ -void __init setup_pci_atmu(struct pci_controller *hose, struct resource *rsrc) +static void __init setup_pci_atmu(struct pci_controller *hose, + struct resource *rsrc) { struct ccsr_pci __iomem *pci; int i; @@ -86,7 +87,7 @@ void __init setup_pci_atmu(struct pci_controller *hose, struct resource *rsrc) out_be32(&pci->piw[2].piwar, PIWAR_2G); } -void __init setup_pci_cmd(struct pci_controller *hose) +static void __init setup_pci_cmd(struct pci_controller *hose) { u16 cmd; int cap_x; @@ -130,7 +131,7 @@ static void __init quirk_fsl_pcie_header(struct pci_dev *dev) return ; } -int __init fsl_pcie_check_link(struct pci_controller *hose) +static int __init fsl_pcie_check_link(struct pci_controller *hose) { u32 val; early_read_config_dword(hose, 0, 0, PCIE_LTSSM, &val); |