diff options
| author |   Sergei Shtylyov <sshtylyov@ru.mvista.com> | 2007-12-25 21:00:45 +0300 |
|---|---|---|
| committer |   Ralf Baechle <ralf@linux-mips.org> | 2008-01-07 15:32:03 +0000 |
| commit | 9cfacb790f581000a7ec8455785d131aca923ded (patch) | |
| tree | d157df01abc4671933787e3d5a14374699665b74 /arch/mips/au1000/common/pci.c | |
| parent | [MIPS] Move inclusing of kernel/time/Kconfig menu to appropriate place (diff) | |
| download | linux-dev-9cfacb790f581000a7ec8455785d131aca923ded.tar.xz linux-dev-9cfacb790f581000a7ec8455785d131aca923ded.zip | |
[MIPS] Alchemy: Fix use of __init code bug exposed by modpost warning
WARNING: vmlinux.o(.text+0x1ca608): Section mismatch: reference to
.init.text: add_wired_entry (between 'config_access' and 'config_read')
by refactoring the code calling add_wired_entry() from config_access() to
a separate function which is called from aau1x_pci_setup(). While at it:
- make some unnecassarily global variables 'static';
- fix the letter case, whitespace, etc. in the comments...
Signed-off-by: Sergei Shtylyov <sshtylyov@ru.mvista.com>
Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
Diffstat (limited to 'arch/mips/au1000/common/pci.c')
| -rw-r--r-- | arch/mips/au1000/common/pci.c | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/arch/mips/au1000/common/pci.c b/arch/mips/au1000/common/pci.c index 6fa70a36a250..ce771487567d 100644 --- a/arch/mips/au1000/common/pci.c +++ b/arch/mips/au1000/common/pci.c @@ -1,8 +1,8 @@ /* * BRIEF MODULE DESCRIPTION - * Alchemy/AMD Au1x00 pci support. + * Alchemy/AMD Au1x00 PCI support. * - * Copyright 2001,2002,2003 MontaVista Software Inc. + * Copyright 2001-2003, 2007 MontaVista Software Inc. * Author: MontaVista Software, Inc. * ppopov@mvista.com or source@mvista.com * @@ -66,6 +66,8 @@ static unsigned long virt_io_addr; static int __init au1x_pci_setup(void) { + extern void au1x_pci_cfg_init(void); + #if defined(CONFIG_SOC_AU1500) || defined(CONFIG_SOC_AU1550) virt_io_addr = (unsigned long)ioremap(Au1500_PCI_IO_START, Au1500_PCI_IO_END - Au1500_PCI_IO_START + 1); @@ -94,6 +96,8 @@ static int __init au1x_pci_setup(void) set_io_port_base(virt_io_addr); #endif + au1x_pci_cfg_init(); + register_pci_controller(&au1x_controller); return 0; } |