diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2011-10-31 00:22:54 +0100 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2011-10-31 00:22:54 +0100 |
| commit | c6c3a3a03e6de52866bc81a32fc551733625d553 (patch) | |
| tree | b55967a9163dba315e2543d648de758b82c85fa1 /arch/arm/mach-omap2/irq.c | |
| parent | ARM: SAMSUNG: Move fimc plat. device from board files to plat-samsung (diff) | |
| parent | ARM: OMAP: Warn if omap_ioremap is called before SoC detection (diff) | |
| download | linux-c6c3a3a03e6de52866bc81a32fc551733625d553.tar.xz linux-c6c3a3a03e6de52866bc81a32fc551733625d553.zip | |
Merge branch 'omap/cleanup' into next/cleanup2
Diffstat (limited to 'arch/arm/mach-omap2/irq.c')
| -rw-r--r-- | arch/arm/mach-omap2/irq.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/arm/mach-omap2/irq.c b/arch/arm/mach-omap2/irq.c index 3a12f7586a4c..65f1be6a182c 100644 --- a/arch/arm/mach-omap2/irq.c +++ b/arch/arm/mach-omap2/irq.c @@ -165,8 +165,8 @@ static void __init omap_init_irq(u32 base, int nr_irqs) omap_irq_bank_init_one(bank); - for (i = 0, j = 0; i < bank->nr_irqs; i += 32, j += 0x20) - omap_alloc_gc(bank->base_reg + j, i, 32); + for (j = 0; j < bank->nr_irqs; j += 32) + omap_alloc_gc(bank->base_reg + j, j, 32); nr_of_irqs += bank->nr_irqs; nr_banks++; |