lkml.org 
[lkml]   [2008]   [Oct]   [13]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    Date
    From
    Subject[patch 15/18] m68k: init_irq_proc depends on CONFIG_PROC_FS
    From: Geert Uytterhoeven <geert@linux-m68k.org>

    If CONFIG_PROC_FS is not set, I get:

    | arch/m68k/kernel/ints.c:433: error: redefinition of 'init_irq_proc'
    | include/linux/interrupt.h:438: error: previous definition of 'init_irq_proc' was here

    This was introduced by commit 6168a702ab0be181e5e57a0b2d0e7376f7a47f0b
    ("Declare init_irq_proc before we use it."), which replaced the #ifdef
    protection of the init_irq_proc() call by a static inline dummy if
    CONFIG_PROC_FS is not set.

    Make init_irq_proc() depend on CONFIG_PROC_FS to fix this.

    Signed-off-by: Geert Uytterhoeven <geert@linux-m68k.org>
    ---
    arch/m68k/kernel/ints.c | 3 ++-
    1 file changed, 2 insertions(+), 1 deletion(-)

    --- a/arch/m68k/kernel/ints.c
    +++ b/arch/m68k/kernel/ints.c
    @@ -429,8 +429,9 @@ int show_interrupts(struct seq_file *p,
    return 0;
    }

    +#ifdef CONFIG_PROC_FS
    void init_irq_proc(void)
    {
    /* Insert /proc/irq driver here */
    }
    -
    +#endif
    --
    Gr{oetje,eeting}s,
    Geert

    --
    Geert Uytterhoeven -- There's lots of Linux beyond ia32 -- geert@linux-m68k.org

    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



    \
     
     \ /
      Last update: 2008-10-13 22:13    [W:4.813 / U:0.088 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site