Commit da9870e4 authored by Geert Uytterhoeven's avatar Geert Uytterhoeven Committed by Linus Torvalds

m68k: init_irq_proc depends on CONFIG_PROC_FS

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 6168a702
("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: default avatarGeert Uytterhoeven <geert@linux-m68k.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent 2171a19a
...@@ -429,8 +429,9 @@ int show_interrupts(struct seq_file *p, void *v) ...@@ -429,8 +429,9 @@ int show_interrupts(struct seq_file *p, void *v)
return 0; return 0;
} }
#ifdef CONFIG_PROC_FS
void init_irq_proc(void) void init_irq_proc(void)
{ {
/* Insert /proc/irq driver here */ /* Insert /proc/irq driver here */
} }
#endif
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment