Commit da9870e4 authored Oct 13, 2008 by Geert Uytterhoeven Committed by Linus Torvalds Oct 14, 2008

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: Geert Uytterhoeven <geert@linux-m68k.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

parent 2171a19a

arch/m68k/kernel/ints.c

+2 −1

Original line number	Diff line number	Diff line
		@@ -429,8 +429,9 @@ int show_interrupts(struct seq_file p, void v)
		return 0;
		}

		#ifdef CONFIG_PROC_FS
		void init_irq_proc(void)
		{
		/* Insert /proc/irq driver here */
		}

		#endif

Admin message