On Sun, Oct 19, 2014 at 7:43 PM, Stefan Hengelein
<stefan.hengelein@xxxxxx> wrote:
> When CONFIG_PCI is disabled, 'db120_pci_init()' had a different
> signature than when was enabled. Therefore, compilation failed when
> CONFIG_PCI was not present.
>
> arch/mips/ath79/mach-db120.c:132: error: too many arguments to function 'db120_pci_init'
>
> Signed-off-by: Stefan Hengelein <stefan.hengelein@xxxxxx>
> ---
> arch/mips/ath79/mach-db120.c | 4 ++--
> 1 file changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/arch/mips/ath79/mach-db120.c b/arch/mips/ath79/mach-db120.c
> index 4d661a1..d1a783d 100644
> --- a/arch/mips/ath79/mach-db120.c
> +++ b/arch/mips/ath79/mach-db120.c
> @@ -112,8 +112,6 @@ static void __init db120_pci_init(u8 *eeprom)
> ath79_pci_set_plat_dev_init(db120_pci_plat_dev_init);
> ath79_register_pci();
> }
> -#else
> -static inline void db120_pci_init(void) {}
Please fix the prototype above, instead of removing it and its caller.
> #endif /* CONFIG_PCI */
>
> static void __init db120_setup(void)
> @@ -129,7 +127,9 @@ static void __init db120_setup(void)
> ARRAY_SIZE(db120_spi_info));
> ath79_register_usb();
> ath79_register_wmac(art + DB120_WMAC_CALDATA_OFFSET);
> +#ifdef CONFIG_PCI
> db120_pci_init(art + DB120_PCIE_CALDATA_OFFSET);
> +#endif
> }
Gr{oetje,eeting}s,
Geert
--
Geert Uytterhoeven -- There's lots of Linux beyond ia32 -- geert@xxxxxxxxxxxxxx
In personal conversations with technical people, I call myself a hacker. But
when I'm talking to journalists I just say "programmer" or something like that.
-- Linus Torvalds
