diff options
| author | Russell King <rmk@dyn-67.arm.linux.org.uk> | 2007-02-20 14:13:30 -0500 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2007-02-20 14:13:30 -0500 |
| commit | 5a84d159061d914c8dd4aa372ac6e9529c2be453 (patch) | |
| tree | 9b08af78085334af44414adafe0096276f8fe0ff /arch/mips/momentum/jaguar_atx/irq.c | |
| parent | e80a0e6e7ccdf64575d4384cb4172860422f5b81 (diff) | |
| parent | 7d477a04a619e90ee08724e8f2d8803c6bdfcef8 (diff) | |
Merge ARM fixes
Diffstat (limited to 'arch/mips/momentum/jaguar_atx/irq.c')
| -rw-r--r-- | arch/mips/momentum/jaguar_atx/irq.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/mips/momentum/jaguar_atx/irq.c b/arch/mips/momentum/jaguar_atx/irq.c index 2efb25aa1aed..f2b432585df2 100644 --- a/arch/mips/momentum/jaguar_atx/irq.c +++ b/arch/mips/momentum/jaguar_atx/irq.c | |||
| @@ -82,8 +82,8 @@ void __init arch_init_irq(void) | |||
| 82 | */ | 82 | */ |
| 83 | clear_c0_status(ST0_IM); | 83 | clear_c0_status(ST0_IM); |
| 84 | 84 | ||
| 85 | mips_cpu_irq_init(0); | 85 | mips_cpu_irq_init(); |
| 86 | rm7k_cpu_irq_init(8); | 86 | rm7k_cpu_irq_init(); |
| 87 | 87 | ||
| 88 | /* set up the cascading interrupts */ | 88 | /* set up the cascading interrupts */ |
| 89 | setup_irq(8, &cascade_mv64340); | 89 | setup_irq(8, &cascade_mv64340); |