diff options
| author | Jason Cooper <jason@lakedaemon.net> | 2014-09-14 07:53:54 +0000 |
|---|---|---|
| committer | Jason Cooper <jason@lakedaemon.net> | 2014-09-14 07:53:54 +0000 |
| commit | 468a903c0e5147e3f93187f0b808a3ef957fd00e (patch) | |
| tree | 63542d05b1c0f730ec1ad5f915dc4eb3c015e616 /drivers/irqchip/irq-versatile-fpga.c | |
| parent | ce92bfe88ba38e76371feb93307125fac3f800f0 (diff) | |
| parent | 087fe000f086c933f831044cbd0e69b4e140f38c (diff) | |
| download | linux-next-468a903c0e5147e3f93187f0b808a3ef957fd00e.tar.gz | |
Merge branch 'irqchip/handle_domain' into irqchip/core
Diffstat (limited to 'drivers/irqchip/irq-versatile-fpga.c')
| -rw-r--r-- | drivers/irqchip/irq-versatile-fpga.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/irqchip/irq-versatile-fpga.c b/drivers/irqchip/irq-versatile-fpga.c index ccf58548b161..1ab451729a5c 100644 --- a/drivers/irqchip/irq-versatile-fpga.c +++ b/drivers/irqchip/irq-versatile-fpga.c @@ -96,7 +96,7 @@ static int handle_one_fpga(struct fpga_irq_data *f, struct pt_regs *regs) while ((status = readl(f->base + IRQ_STATUS))) { irq = ffs(status) - 1; - handle_IRQ(irq_find_mapping(f->domain, irq), regs); + handle_domain_irq(f->domain, irq, regs); handled = 1; } |