diff options
author | Stefan Hengelein <stefan.hengelein@fau.de> | 2014-10-20 15:11:39 +0200 |
---|---|---|
committer | Ralf Baechle <ralf@linux-mips.org> | 2014-10-22 23:16:59 +0200 |
commit | 44da7623e307bba3eefd7eaf11e605e15a923d72 (patch) | |
tree | e7e7ce37629a4b5e0c3d09218938b349c303edd5 /arch/mips/ath79 | |
parent | cd3d6438b4cdbe39fe8daf1a0abeebabcf9521d5 (diff) | |
download | op-kernel-dev-44da7623e307bba3eefd7eaf11e605e15a923d72.zip op-kernel-dev-44da7623e307bba3eefd7eaf11e605e15a923d72.tar.gz |
MIPS: ath79: Fix compilation error when CONFIG_PCI is disabled
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'
This error was found with vampyr.
Signed-off-by: Stefan Hengelein <stefan.hengelein@fau.de>
Reviewed-by: Markos Chandras <markos.chandras@imgtec.com>
Cc: linux-mips@linux-mips.org
Cc: linux-kernel@vger.kernel.org
Cc: geert@linux-m68k.org
Patchwork: https://patchwork.linux-mips.org/patch/8119/
Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
Diffstat (limited to 'arch/mips/ath79')
-rw-r--r-- | arch/mips/ath79/mach-db120.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/mips/ath79/mach-db120.c b/arch/mips/ath79/mach-db120.c index 4d661a1..9423f5a 100644 --- a/arch/mips/ath79/mach-db120.c +++ b/arch/mips/ath79/mach-db120.c @@ -113,7 +113,7 @@ static void __init db120_pci_init(u8 *eeprom) ath79_register_pci(); } #else -static inline void db120_pci_init(void) {} +static inline void db120_pci_init(u8 *eeprom) {} #endif /* CONFIG_PCI */ static void __init db120_setup(void) |