diff options
| author | Linus Torvalds <torvalds@g5.osdl.org> | 2006-03-25 11:39:55 -0500 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-03-25 11:39:55 -0500 |
| commit | d71eecf3b8e893757cc3dec560c96a32ac090890 (patch) | |
| tree | 5ca3ce995f506c8659753d24b911f5502b36e201 /arch/sparc/kernel/sun4d_irq.c | |
| parent | b55813a2e50088ca30df33fa62aeed5d3adb1796 (diff) | |
| parent | a54123e27779049d27d21e6c8adfee73aa2c0734 (diff) | |
Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/sparc-2.6
* master.kernel.org:/pub/scm/linux/kernel/git/davem/sparc-2.6:
[SPARC]: Try to start getting SMP back into shape.
Diffstat (limited to 'arch/sparc/kernel/sun4d_irq.c')
| -rw-r--r-- | arch/sparc/kernel/sun4d_irq.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/sparc/kernel/sun4d_irq.c b/arch/sparc/kernel/sun4d_irq.c index cea7fc6fc6e5..ca656d9bd6fd 100644 --- a/arch/sparc/kernel/sun4d_irq.c +++ b/arch/sparc/kernel/sun4d_irq.c | |||
| @@ -54,7 +54,7 @@ unsigned char cpu_leds[32]; | |||
| 54 | unsigned char sbus_tid[32]; | 54 | unsigned char sbus_tid[32]; |
| 55 | #endif | 55 | #endif |
| 56 | 56 | ||
| 57 | extern struct irqaction *irq_action[]; | 57 | static struct irqaction *irq_action[NR_IRQS]; |
| 58 | extern spinlock_t irq_action_lock; | 58 | extern spinlock_t irq_action_lock; |
| 59 | 59 | ||
| 60 | struct sbus_action { | 60 | struct sbus_action { |