diff options
| author | Mark Brown <broonie@linaro.org> | 2014-07-14 10:45:20 +0100 |
|---|---|---|
| committer | Mark Brown <broonie@linaro.org> | 2014-07-14 10:45:20 +0100 |
| commit | fa6e05294759c29b3736010aa386928d24715feb (patch) | |
| tree | 3d75b2933fe5d5dbcfb2983d5147f8867bc0157a /drivers/irqchip | |
| parent | 49bcf50125c661f45a030edd1a241917f1c7a821 (diff) | |
| parent | d93efdcd512a5b663cfb2da04afabd74af5d95b6 (diff) | |
Merge tag 'v3.10.48' into linux-linaro-lsk
This is the 3.10.48 stable release
Diffstat (limited to 'drivers/irqchip')
| -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 8527743b5cef..391b9cea73ed 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 = { |