[patch 15/18] m68k: init_irq_proc depends on CONFIG_PROC_FS

Geert Uytterhoeven
2008-10-13T20:05:43Z

[-- Attachment #1: m68k-init_irq_proc-depends-on-CONFIG_PROC_FS.diff --]
[-- Type: text/plain, Size: 1238 bytes --]

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