diff options
author | Ingo Molnar <mingo@elte.hu> | 2011-03-30 09:07:39 +0200 |
---|---|---|
committer | Ingo Molnar <mingo@elte.hu> | 2011-03-30 09:07:43 +0200 |
commit | 9f644c4ba86b76159d36747fda7da496f72a1872 (patch) | |
tree | 31e025a5f283aff691fb636bf07fd0b445cf07a3 /arch/mips/kernel/irq_txx9.c | |
parent | 1b7155f7de119870f0d3fad89f125de2ff6c16be (diff) | |
parent | 0ce790e7d736cedc563e1fb4e998babf5a4dbc3d (diff) | |
download | op-kernel-dev-9f644c4ba86b76159d36747fda7da496f72a1872.zip op-kernel-dev-9f644c4ba86b76159d36747fda7da496f72a1872.tar.gz |
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/kernel/irq_txx9.c')
-rw-r--r-- | arch/mips/kernel/irq_txx9.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/mips/kernel/irq_txx9.c b/arch/mips/kernel/irq_txx9.c index 526e158..b0c55b5 100644 --- a/arch/mips/kernel/irq_txx9.c +++ b/arch/mips/kernel/irq_txx9.c @@ -154,8 +154,8 @@ void __init txx9_irq_init(unsigned long baseaddr) for (i = 0; i < TXx9_MAX_IR; i++) { txx9irq[i].level = 4; /* middle level */ txx9irq[i].mode = TXx9_IRCR_LOW; - set_irq_chip_and_handler(TXX9_IRQ_BASE + i, - &txx9_irq_chip, handle_level_irq); + irq_set_chip_and_handler(TXX9_IRQ_BASE + i, &txx9_irq_chip, + handle_level_irq); } /* mask all IRC interrupts */ |