]> git.proxmox.com Git - mirror_ubuntu-kernels.git/commitdiff
sparc: Fix minor SPARC32 compile error
authorJulian Calaby <julian.calaby@gmail.com>
Tue, 6 Jan 2009 02:13:49 +0000 (18:13 -0800)
committerDavid S. Miller <davem@davemloft.net>
Tue, 6 Jan 2009 02:13:49 +0000 (18:13 -0800)
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>
arch/sparc/kernel/irq_32.c

index f3488c45d57a0d7867b9292af1f2a01c2cbc6c56..1eff942fe22fddaff34e5a37c2c4392779b21067 100644 (file)
@@ -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 */