diff options
author | Christian Engelmayer <cengelma@gmx.at> | 2013-12-15 13:39:26 -0500 |
---|---|---|
committer | Scott Wood <scottwood@freescale.com> | 2014-01-07 20:23:31 -0500 |
commit | 1e83bf875e1eb14f99b3ce1cb5580a09f18ac8af (patch) | |
tree | 4227c2d4f4152c78911e0439777c8db35d18976a | |
parent | 8b52312880ecbc5beb40b313600f2903c16a59ed (diff) |
powerpc/sysdev: Fix a pci section mismatch for Book E
Moved the following functions out of the __init section:
arch/powerpc/sysdev/fsl_pci.c : fsl_add_bridge()
arch/powerpc/sysdev/indirect_pci.c : setup_indirect_pci()
Those are referenced by arch/powerpc/sysdev/fsl_pci.c : fsl_pci_probe() when
compiling for Book E support.
Signed-off-by: Christian Engelmayer <cengelma@gmx.at>
Signed-off-by: Scott Wood <scottwood@freescale.com>
-rw-r--r-- | arch/powerpc/sysdev/fsl_pci.c | 2 | ||||
-rw-r--r-- | arch/powerpc/sysdev/indirect_pci.c | 6 |
2 files changed, 3 insertions, 5 deletions
diff --git a/arch/powerpc/sysdev/fsl_pci.c b/arch/powerpc/sysdev/fsl_pci.c index 7066e5262468..e8be4344742b 100644 --- a/arch/powerpc/sysdev/fsl_pci.c +++ b/arch/powerpc/sysdev/fsl_pci.c | |||
@@ -454,7 +454,7 @@ void fsl_pcibios_fixup_bus(struct pci_bus *bus) | |||
454 | } | 454 | } |
455 | } | 455 | } |
456 | 456 | ||
457 | int __init fsl_add_bridge(struct platform_device *pdev, int is_primary) | 457 | int fsl_add_bridge(struct platform_device *pdev, int is_primary) |
458 | { | 458 | { |
459 | int len; | 459 | int len; |
460 | struct pci_controller *hose; | 460 | struct pci_controller *hose; |
diff --git a/arch/powerpc/sysdev/indirect_pci.c b/arch/powerpc/sysdev/indirect_pci.c index c6c8b526a4f6..1f6c570d66d4 100644 --- a/arch/powerpc/sysdev/indirect_pci.c +++ b/arch/powerpc/sysdev/indirect_pci.c | |||
@@ -152,10 +152,8 @@ static struct pci_ops indirect_pci_ops = | |||
152 | .write = indirect_write_config, | 152 | .write = indirect_write_config, |
153 | }; | 153 | }; |
154 | 154 | ||
155 | void __init | 155 | void setup_indirect_pci(struct pci_controller *hose, resource_size_t cfg_addr, |
156 | setup_indirect_pci(struct pci_controller* hose, | 156 | resource_size_t cfg_data, u32 flags) |
157 | resource_size_t cfg_addr, | ||
158 | resource_size_t cfg_data, u32 flags) | ||
159 | { | 157 | { |
160 | resource_size_t base = cfg_addr & PAGE_MASK; | 158 | resource_size_t base = cfg_addr & PAGE_MASK; |
161 | void __iomem *mbase; | 159 | void __iomem *mbase; |