diff options
| author |  Jason Cooper <jason@lakedaemon.net>
| 2014-06-24 12:35:53 +0000 |
|---|---|---|
| committer | Jason Cooper <jason@lakedaemon.net>
| 2014-06-24 12:35:53 +0000 |
| commit | c874a5974abb6cfe3b5d1945ed251fc12f706985 (patch) | |
| tree | 35bf4ff35af672f334d867d182ea35761982df49 /drivers/irqchip/spear-shirq.c | |
| parent | irqchip: nvic: Use the generic noop function (diff) | |
| parent | irqchip: spear_shirq: Fix interrupt offset (diff) | |
| download | linux-c874a5974abb6cfe3b5d1945ed251fc12f706985.tar.gz linux-c874a5974abb6cfe3b5d1945ed251fc12f706985.tar.bz2 linux-c874a5974abb6cfe3b5d1945ed251fc12f706985.zip | |
Merge branch 'irqchip/urgent' into irqchip/core
Diffstat (limited to 'drivers/irqchip/spear-shirq.c')
| -rw-r--r-- | drivers/irqchip/spear-shirq.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/irqchip/spear-shirq.c b/drivers/irqchip/spear-shirq.c index 3fdda3a40269..6ce6bd3441bf 100644 --- a/drivers/irqchip/spear-shirq.c +++ b/drivers/irqchip/spear-shirq.c @@ -125,7 +125,7 @@ static struct spear_shirq spear320_shirq_ras2 = { }; static struct spear_shirq spear320_shirq_ras3 = { - .irq_nr = 3, + .irq_nr = 7, .irq_bit_off = 0, .invalid_irq = 1, .regs = { |