mips: fix SNI_RM EISA=n compilation
PATCH 1/1 mips: fix SNI_RM EISA=n compilation
This patch fixes the following build error with CONFIG_EISA=n caused by commit 231a35d37293ab88d325a9cb94e5474c156282c0:
<-- snip -->
...
LD .tmp_vmlinux1arch/mips/sni/built-in.o: In function `snirm_a20r_setup_devinit':
a20r.c:(.init.text+0x42c): undefined reference to sni_eisa_root_init' a20r.c:(.init.text+0x42c): relocation truncated to fit: R_MIPS_26 against sni_eisa_root_init' arch/mips/sni/built-in.o: In function `snirm_setup_devinit':
rm200.c:(.init.text+0x52c): undefined reference to sni_eisa_root_init' rm200.c:(.init.text+0x52c): relocation truncated to fit: R_MIPS_26 against sni_eisa_root_init' make[1]: *** [.tmp_vmlinux1] Error 1
<-- snip -->
---f6a6c34454cbe463e2d8d567d9e0659161a82a72 diff --git a/include/asm-mips/sni.h b/include/asm-mips/sni.h index e716447..8c1eb02 100644
include/asm-mips/sni.h +7 -0
@@ -228,7 +228,14 @@ extern void sni_pcimt_irq_init(void);extern void sni_cpu_time_init (void );/* eisa init for RM200/400 */ +#ifdef CONFIG_EISA extern int sni_eisa_root_init (void ); +#else +static inline int sni_eisa_root_init (void ) +{ +return 0 ; +} +#endif /* common irq stuff */ extern void (*sni_hwint)(void );
Quoted 15 lines · Adrian Bunk
This patch fixes the following build error with
CONFIG_EISA=ncaused by commit231a35d37293ab88d325a9cb94e5474c156282c0:<-- snip -->
...
LD .tmp_vmlinux1arch/mips/sni/built-in.o: In function `snirm_a20r_setup_devinit':
a20r.c:(.init.text+0x42c): undefined reference tosni_eisa_root_init' a20r.c:(.init.text+0x42c): relocation truncated to fit: R_MIPS_26 againstsni_eisa_root_init'arch/mips/sni/built-in.o: In function `snirm_setup_devinit':
rm200.c:(.init.text+0x52c): undefined reference tosni_eisa_root_init' rm200.c:(.init.text+0x52c): relocation truncated to fit: R_MIPS_26 againstsni_eisa_root_init' make[1]: *** [.tmp_vmlinux1] Error 1
Quoted 3 lines
<-- snip -->
Signed-off-by Adrian Bunk <[email protected]>
Thanks for your fix, Adrian.
Ralf, please apply.
Quoted 21 lines
---
f6a6c34454cbe463e2d8d567d9e0659161a82a72diff --gita/include/asm-mips/sni.hb/include/asm-mips/sni.hindex e716447..8c1eb02 100644include/asm-mips/sni.h +7
-0@@ -228,7 +228,14 @@ extern void sni_pcimt_irq_init(void);extern void sni_cpu_time_init (void );/* eisa init for RM200/400 */ +#ifdef CONFIG_EISA extern int sni_eisa_root_init (void ); +#else +static inline int sni_eisa_root_init (void ) +{ +return 0 ; +} +#endif /* common irq stuff */ extern void (*sni_hwint)(void );
Signature · 2 lines
Crap can work. Given enough thrust pigs will fly, but it's not necessary a good idea. [ RFC1925, 2.3 ]
Ralf Baechle
AppliedQuoted 2 lines · Adrian Bunk
This patch fixes the following build error with
CONFIG_EISA=ncaused by commit231a35d37293ab88d325a9cb94e5474c156282c0:
Applied. Thanks,
Ralf