diff options
| author | Ingo Molnar <mingo@elte.hu> | 2011-03-30 03:07:39 -0400 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2011-03-30 03:07:43 -0400 |
| commit | 9f644c4ba86b76159d36747fda7da496f72a1872 (patch) | |
| tree | 31e025a5f283aff691fb636bf07fd0b445cf07a3 /arch/mips/rb532 | |
| parent | 1b7155f7de119870f0d3fad89f125de2ff6c16be (diff) | |
| parent | 0ce790e7d736cedc563e1fb4e998babf5a4dbc3d (diff) | |
Merge commit 'v2.6.39-rc1' into perf/urgent
Merge reason: use the post-merge-window tree.
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'arch/mips/rb532')
| -rw-r--r-- | arch/mips/rb532/irq.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/mips/rb532/irq.c b/arch/mips/rb532/irq.c index b32a768da894..7c6db74e3fad 100644 --- a/arch/mips/rb532/irq.c +++ b/arch/mips/rb532/irq.c | |||
| @@ -207,8 +207,8 @@ void __init arch_init_irq(void) | |||
| 207 | pr_info("Initializing IRQ's: %d out of %d\n", RC32434_NR_IRQS, NR_IRQS); | 207 | pr_info("Initializing IRQ's: %d out of %d\n", RC32434_NR_IRQS, NR_IRQS); |
| 208 | 208 | ||
| 209 | for (i = 0; i < RC32434_NR_IRQS; i++) | 209 | for (i = 0; i < RC32434_NR_IRQS; i++) |
| 210 | set_irq_chip_and_handler(i, &rc32434_irq_type, | 210 | irq_set_chip_and_handler(i, &rc32434_irq_type, |
| 211 | handle_level_irq); | 211 | handle_level_irq); |
| 212 | } | 212 | } |
| 213 | 213 | ||
| 214 | /* Main Interrupt dispatcher */ | 214 | /* Main Interrupt dispatcher */ |