diff options
| author | Ingo Molnar <mingo@elte.hu> | 2011-04-01 21:14:04 +0200 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2011-04-01 21:14:04 +0200 |
| commit | 5679027e74126e0dfc860869b0e7ceab1dd06318 (patch) | |
| tree | 9a18b1a2f53be3bad8c9e4db01617fb51f067f64 /arch/mips/kernel/irq-rm7000.c | |
| parent | ccd0d44fad38dc1bb4b26dcc7a30e9f2c3b36870 (diff) | |
| parent | a4dd99250dc49031e6a92a895dbcc230a4832083 (diff) | |
Merge branch 'rcu/urgent' of git://git.kernel.org/pub/scm/linux/kernel/git/paulmck/linux-2.6-rcu into core/urgent
Diffstat (limited to 'arch/mips/kernel/irq-rm7000.c')
| -rw-r--r-- | arch/mips/kernel/irq-rm7000.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/mips/kernel/irq-rm7000.c b/arch/mips/kernel/irq-rm7000.c index fd24fd98b04..a8a8977d588 100644 --- a/arch/mips/kernel/irq-rm7000.c +++ b/arch/mips/kernel/irq-rm7000.c @@ -45,6 +45,6 @@ void __init rm7k_cpu_irq_init(void) clear_c0_intcontrol(0x00000f00); /* Mask all */ for (i = base; i < base + 4; i++) - set_irq_chip_and_handler(i, &rm7k_irq_controller, + irq_set_chip_and_handler(i, &rm7k_irq_controller, handle_percpu_irq); } |