diff options
| author | Julian Calaby <julian.calaby@gmail.com> | 2009-01-05 18:13:49 -0800 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2009-01-05 18:13:49 -0800 |
| commit | 4696b64d234b84b5b70ffd49a76833aa5c49cb61 (patch) | |
| tree | c1a1a647395e1b24395dee7b34501d12bdce3e40 /arch/sparc/kernel | |
| parent | 576b4d0cce9716a3a6c67ded27a638ef833b0a54 (diff) | |
| download | op-kernel-dev-4696b64d234b84b5b70ffd49a76833aa5c49cb61.zip op-kernel-dev-4696b64d234b84b5b70ffd49a76833aa5c49cb61.tar.gz | |
sparc: Fix minor SPARC32 compile error
When CONFIG_PROC_FS is unset, include/linux/interrupt.h defines
init_irq_proc() as an empty function.
arch/sparc/kernel/irq_32.c defines this function unconditionally.
Fix the latter so that it only defines this function when CONFIG_PROC_FS
is set.
This fixes the following error:
arch/sparc/kernel/irq_32.c:672: error: redefinition of 'init_irq_proc'
include/linux/interrupt.h:461: error: previous definition of
'init_irq_proc' was here
This was found using randconfig builds.
Signed-off-by: Julian Calaby <julian.calaby@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'arch/sparc/kernel')
| -rw-r--r-- | arch/sparc/kernel/irq_32.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/arch/sparc/kernel/irq_32.c b/arch/sparc/kernel/irq_32.c index f3488c4..1eff942 100644 --- a/arch/sparc/kernel/irq_32.c +++ b/arch/sparc/kernel/irq_32.c @@ -669,7 +669,9 @@ void __init init_IRQ(void) btfixup(); } +#ifdef CONFIG_PROC_FS void init_irq_proc(void) { /* For now, nothing... */ } +#endif /* CONFIG_PROC_FS */ |
