diff options
| author | Simon Horman <horms+renesas@verge.net.au> | 2015-11-24 04:00:02 +0100 |
|---|---|---|
| committer | Simon Horman <horms+renesas@verge.net.au> | 2015-11-24 04:00:02 +0100 |
| commit | 998f468f34f41905051556a9897dbc204b1b75b4 (patch) | |
| tree | 75e402d58ccdcf516daf6a0fa8f54e33cf841787 /arch/arm/mach-footbridge | |
| parent | ARM: shmobile: alt: add VIN0, ADV7180 DT support (diff) | |
| parent | Linux 4.4-rc1 (diff) | |
| download | linux-998f468f34f41905051556a9897dbc204b1b75b4.tar.xz linux-998f468f34f41905051556a9897dbc204b1b75b4.zip | |
Merge tag 'v4.4-rc1' into HEAD
Linux 4.4-rc1
Diffstat (limited to 'arch/arm/mach-footbridge')
| -rw-r--r-- | arch/arm/mach-footbridge/isa-irq.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/arch/arm/mach-footbridge/isa-irq.c b/arch/arm/mach-footbridge/isa-irq.c index fcd79bc3a3e1..c01fca11b224 100644 --- a/arch/arm/mach-footbridge/isa-irq.c +++ b/arch/arm/mach-footbridge/isa-irq.c @@ -87,13 +87,12 @@ static struct irq_chip isa_hi_chip = { .irq_unmask = isa_unmask_pic_hi_irq, }; -static void -isa_irq_handler(unsigned int irq, struct irq_desc *desc) +static void isa_irq_handler(struct irq_desc *desc) { unsigned int isa_irq = *(unsigned char *)PCIIACK_BASE; if (isa_irq < _ISA_IRQ(0) || isa_irq >= _ISA_IRQ(16)) { - do_bad_IRQ(isa_irq, desc); + do_bad_IRQ(desc); return; } |