diff options
author | Ingo Molnar <mingo@elte.hu> | 2008-06-19 03:37:31 -0400 |
---|---|---|
committer | Ingo Molnar <mingo@elte.hu> | 2008-06-19 03:37:31 -0400 |
commit | d819c49da624e3ee09b2844603d58265039eecdd (patch) | |
tree | 09a503b98769767d81337ec8e5c14c60874a4e77 /arch/mips/lasat/interrupt.c | |
parent | f18f982abf183e91f435990d337164c7a43d1e6d (diff) | |
parent | 9bedbcb207ed9a571b239231d99c8fd4a34ae24d (diff) |
Merge branch 'linus' into sched/urgent
Diffstat (limited to 'arch/mips/lasat/interrupt.c')
-rw-r--r-- | arch/mips/lasat/interrupt.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/arch/mips/lasat/interrupt.c b/arch/mips/lasat/interrupt.c index cfeab669782f..a56c15026965 100644 --- a/arch/mips/lasat/interrupt.c +++ b/arch/mips/lasat/interrupt.c | |||
@@ -34,11 +34,13 @@ static volatile int lasat_int_mask_shift; | |||
34 | 34 | ||
35 | void disable_lasat_irq(unsigned int irq_nr) | 35 | void disable_lasat_irq(unsigned int irq_nr) |
36 | { | 36 | { |
37 | irq_nr -= LASAT_IRQ_BASE; | ||
37 | *lasat_int_mask &= ~(1 << irq_nr) << lasat_int_mask_shift; | 38 | *lasat_int_mask &= ~(1 << irq_nr) << lasat_int_mask_shift; |
38 | } | 39 | } |
39 | 40 | ||
40 | void enable_lasat_irq(unsigned int irq_nr) | 41 | void enable_lasat_irq(unsigned int irq_nr) |
41 | { | 42 | { |
43 | irq_nr -= LASAT_IRQ_BASE; | ||
42 | *lasat_int_mask |= (1 << irq_nr) << lasat_int_mask_shift; | 44 | *lasat_int_mask |= (1 << irq_nr) << lasat_int_mask_shift; |
43 | } | 45 | } |
44 | 46 | ||