From: Geert Uytterhoeven <geert@linux-m68k.org>
Date: Mon, 13 Oct 2008 19:59:01 +0000 (+0200)
Subject: m68k: init_irq_proc depends on CONFIG_PROC_FS
X-Git-Tag: v2.6.28-rc1~584
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=da9870e477492e0f837aa0cd26b2ac2e372b91d2;p=pandora-kernel.git

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>
---

Reading git-diff-tree failed