]> pilppa.com Git - linux-2.6-omap-h63xx.git/commit
m68k: init_irq_proc depends on CONFIG_PROC_FS
authorGeert Uytterhoeven <geert@linux-m68k.org>
Mon, 13 Oct 2008 19:59:01 +0000 (21:59 +0200)
committerLinus Torvalds <torvalds@linux-foundation.org>
Tue, 14 Oct 2008 17:23:27 +0000 (10:23 -0700)
commitda9870e477492e0f837aa0cd26b2ac2e372b91d2
treee5b941fe84156b49b475a789d037823dc16ccb34
parent2171a19a246551dac7805faa077075f7222507ac
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 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>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
arch/m68k/kernel/ints.c