diff options
| author | Thomas Gleixner <tglx@linutronix.de> | 2008-10-16 15:33:18 +0200 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2008-10-16 16:53:30 +0200 |
| commit | 4b1135a277f4b38f60b9c9f28adae467feb07856 (patch) | |
| tree | 7014a4a687220ebe66dacb6ba75d37610d8279f3 /arch/arm/mach-ixp2000/ixdp2x00.c | |
| parent | 63d659d556f145d33798b8ad19ced10c254fe445 (diff) | |
| download | blackbird-op-linux-4b1135a277f4b38f60b9c9f28adae467feb07856.tar.gz blackbird-op-linux-4b1135a277f4b38f60b9c9f28adae467feb07856.zip | |
genirq: fix name space collisions of nr_irqs in arch/*
local shadows of global variables are _bad_
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Diffstat (limited to 'arch/arm/mach-ixp2000/ixdp2x00.c')
| -rw-r--r-- | arch/arm/mach-ixp2000/ixdp2x00.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/arm/mach-ixp2000/ixdp2x00.c b/arch/arm/mach-ixp2000/ixdp2x00.c index b0653a87159a..30451300751b 100644 --- a/arch/arm/mach-ixp2000/ixdp2x00.c +++ b/arch/arm/mach-ixp2000/ixdp2x00.c @@ -143,7 +143,7 @@ static struct irq_chip ixdp2x00_cpld_irq_chip = { .unmask = ixdp2x00_irq_unmask }; -void __init ixdp2x00_init_irq(volatile unsigned long *stat_reg, volatile unsigned long *mask_reg, unsigned long nr_irqs) +void __init ixdp2x00_init_irq(volatile unsigned long *stat_reg, volatile unsigned long *mask_reg, unsigned long nr_of_irqs) { unsigned int irq; @@ -154,7 +154,7 @@ void __init ixdp2x00_init_irq(volatile unsigned long *stat_reg, volatile unsigne board_irq_stat = stat_reg; board_irq_mask = mask_reg; - board_irq_count = nr_irqs; + board_irq_count = nr_of_irqs; *board_irq_mask = 0xffffffff; |
