Merge bk://bk.arm.linux.org.uk/linux-2.6-rmk

into ppc970.osdl.org:/home/torvalds/v2.6/linux

Merge bk://bk.arm.linux.org.uk/linux-2.6-rmk
into ppc970.osdl.org:/home/torvalds/v2.6/linux
30654057 · Linus Torvalds · b235c7db · d566c1c5 · 30654057
Commit 30654057 authored May 18, 2004 by Linus Torvalds
Show whitespace changes
Inline Side-by-side

Showing with 1 addition and 1 deletion

arch/arm/kernel/irq.c arch/arm/kernel/irq.c +1 -1

No files found.
--- a/arch/arm/kernel/irq.c
+++ b/arch/arm/kernel/irq.c
@@ -47,7 +47,7 @@
 #define MAX_IRQ_CNT	100000
 static volatile unsigned long irq_err_count;
-static spinlock_t irq_controller_lock;
+static spinlock_t irq_controller_lock = SPIN_LOCK_UNLOCKED;
 static LIST_HEAD(irq_pending);
 struct irqdesc irq_desc[NR_IRQS];