From a357644ac7eb3fd7177036a0dd9a3b2839184c00 Mon Sep 17 00:00:00 2001 From: Tony Lindgren Date: Fri, 31 Oct 2008 15:12:35 -0700 Subject: [PATCH] Manually merge patch 4b1135a277f4b38f60b9c9f28adae467feb07856 Looks like automerge hosed it somehow. Signed-off-by: Tony Lindgren --- arch/arm/mach-omap2/irq.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/arch/arm/mach-omap2/irq.c b/arch/arm/mach-omap2/irq.c index 68aff9ad8d4..9945146a5db 100644 --- a/arch/arm/mach-omap2/irq.c +++ b/arch/arm/mach-omap2/irq.c @@ -139,7 +139,7 @@ int omap_irq_pending(void) void __init omap_init_irq(void) { - unsigned long nr_irqs = 0; + unsigned long nr_of_irqs = 0; unsigned int nr_banks = 0; int i; @@ -153,14 +153,14 @@ void __init omap_init_irq(void) omap_irq_bank_init_one(bank); - nr_irqs += bank->nr_irqs; + nr_of_irqs += bank->nr_irqs; nr_banks++; } printk(KERN_INFO "Total of %ld interrupts on %d active controller%s\n", - nr_irqs, nr_banks, nr_banks > 1 ? "s" : ""); + nr_of_irqs, nr_banks, nr_banks > 1 ? "s" : ""); - for (i = 0; i < nr_irqs; i++) { + for (i = 0; i < nr_of_irqs; i++) { set_irq_chip(i, &omap_irq_chip); set_irq_handler(i, handle_level_irq); set_irq_flags(i, IRQF_VALID); -- 2.41.1