Merge branch 'linus' into x86/quirks

[deliverable/linux.git] / arch / sparc / kernel / irq.c

diff --git a/arch/sparc/kernel/irq.c b/arch/sparc/kernel/irq.c
index 059598b7e0f0ff6c8f33d667834dfa48612a2b11..93e1d1c65290b8008aef53d02d4de1f0e24c250a 100644 (file)
--- a/arch/sparc/kernel/irq.c
+++ b/arch/sparc/kernel/irq.c
@@ -55,9 +55,6 @@
 #define SMP_NOP2
 #define SMP_NOP3
 #endif /* SMP */
-
-int nr_irqs = NR_IRQS;
-
 unsigned long __raw_local_irq_save(void)
 {
        unsigned long retval;