Gitweb:     
http://git.kernel.org/git/?p=linux/kernel/git/torvalds/linux-2.6.git;a=commit;h=b991b590dc2e54447644d34226dc355b7b6e2337
Commit:     b991b590dc2e54447644d34226dc355b7b6e2337
Parent:     40d7c1aa6153605b3eae23990d4c2d4e8f807cb0
Author:     Adrian Bunk <[EMAIL PROTECTED]>
AuthorDate: Sun Feb 17 23:59:48 2008 +0200
Committer:  Ralf Baechle <[EMAIL PROTECTED]>
CommitDate: Tue Feb 19 17:01:34 2008 +0000

    [MIPS] RM: fix EISA=n compilation
    
    This patch fixes the following build error with CONFIG_EISA=n caused by
    commit 231a35d37293ab88d325a9cb94e5474c156282c0:
    
    <--  snip -->
    
    ...
      LD      .tmp_vmlinux1
    arch/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  -->
    
    Signed-off-by: Adrian Bunk <[EMAIL PROTECTED]>
    Acked-by: Thomas Bogendoerfer <[EMAIL PROTECTED]>
    Signed-off-by: Ralf Baechle <[EMAIL PROTECTED]>
---
 include/asm-mips/sni.h |    7 +++++++
 1 files changed, 7 insertions(+), 0 deletions(-)

diff --git a/include/asm-mips/sni.h b/include/asm-mips/sni.h
index e716447..8c1eb02 100644
--- a/include/asm-mips/sni.h
+++ b/include/asm-mips/sni.h
@@ -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);
-
To unsubscribe from this list: send the line "unsubscribe git-commits-head" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Reply via email to