summaryrefslogtreecommitdiffstats
path: root/arch/arm/kernel/irq.c
diff options
context:
space:
mode:
authorArnd Bergmann <arnd@arndb.de>2011-10-31 14:23:44 +0100
committerArnd Bergmann <arnd@arndb.de>2011-10-31 14:23:44 +0100
commit94314a40bcc537c396012e37cf887572f0d82aef (patch)
tree489b42e181317730713f8800ac2889039b0faae3 /arch/arm/kernel/irq.c
parent929f58aeeb46f964d9468ce1addd993f5d92b11d (diff)
parentf37a53cc5d8a8fb199e41386d125d8c2ed9e54ef (diff)
downloadblackbird-op-linux-94314a40bcc537c396012e37cf887572f0d82aef.tar.gz
blackbird-op-linux-94314a40bcc537c396012e37cf887572f0d82aef.zip
Merge branch 'dt/gic' into imx/imx6q
Diffstat (limited to 'arch/arm/kernel/irq.c')
-rw-r--r--arch/arm/kernel/irq.c3
1 files changed, 0 insertions, 3 deletions
diff --git a/arch/arm/kernel/irq.c b/arch/arm/kernel/irq.c
index 53919b230e8b..7cb29261249a 100644
--- a/arch/arm/kernel/irq.c
+++ b/arch/arm/kernel/irq.c
@@ -59,9 +59,6 @@ int arch_show_interrupts(struct seq_file *p, int prec)
#ifdef CONFIG_SMP
show_ipi_list(p, prec);
#endif
-#ifdef CONFIG_LOCAL_TIMERS
- show_local_irqs(p, prec);
-#endif
seq_printf(p, "%*s: %10lu\n", prec, "Err", irq_err_count);
return 0;
}
OpenPOWER on IntegriCloud