diff options
| author | Russell King <rmk@dyn-67.arm.linux.org.uk> | 2009-08-17 13:16:28 -0400 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2009-08-17 13:16:28 -0400 |
| commit | 29c08460d472e427cec5e5dcb12ec74c923f8250 (patch) | |
| tree | 9d8557fe9cf123920c3ceb023274e763e5f208b0 /arch/arm/kernel | |
| parent | 9b2616c2e8cc98ca98bbb40cad83a8d3d859e840 (diff) | |
| parent | baa28e3530375e0bef2c53243634a1c78f5c02f3 (diff) | |
Merge branch 'next-s3c' of git://aeryn.fluff.org.uk/bjdooks/linux into devel-stable
Diffstat (limited to 'arch/arm/kernel')
| -rw-r--r-- | arch/arm/kernel/irq.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/kernel/irq.c b/arch/arm/kernel/irq.c index b7c3490eaa24..c9a8619f3856 100644 --- a/arch/arm/kernel/irq.c +++ b/arch/arm/kernel/irq.c | |||
| @@ -86,7 +86,7 @@ int show_interrupts(struct seq_file *p, void *v) | |||
| 86 | unlock: | 86 | unlock: |
| 87 | spin_unlock_irqrestore(&irq_desc[i].lock, flags); | 87 | spin_unlock_irqrestore(&irq_desc[i].lock, flags); |
| 88 | } else if (i == NR_IRQS) { | 88 | } else if (i == NR_IRQS) { |
| 89 | #ifdef CONFIG_ARCH_ACORN | 89 | #ifdef CONFIG_FIQ |
| 90 | show_fiq_list(p, v); | 90 | show_fiq_list(p, v); |
| 91 | #endif | 91 | #endif |
| 92 | #ifdef CONFIG_SMP | 92 | #ifdef CONFIG_SMP |