From 726610ca7978ffc66429af70da95cbb160c1d6fd Mon Sep 17 00:00:00 2001 From: Thomas Gleixner Date: Fri, 25 Mar 2011 14:16:55 +0000 Subject: [PATCH] --- yaml --- r: 243037 b: refs/heads/master c: 991353510e8ab5e55c5bbd058c7545f29192cddf h: refs/heads/master i: 243035: 6cc9ad0805520202768cf8bb939929b99684c25b v: v3 --- [refs] | 2 +- trunk/arch/score/kernel/irq.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index ac1afcd1c555..5101321a6354 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: fa73c5bffbb2961ca71d88b4d925038458bc2b4c +refs/heads/master: 991353510e8ab5e55c5bbd058c7545f29192cddf diff --git a/trunk/arch/score/kernel/irq.c b/trunk/arch/score/kernel/irq.c index ee68ec633242..601a56688a1b 100644 --- a/trunk/arch/score/kernel/irq.c +++ b/trunk/arch/score/kernel/irq.c @@ -92,7 +92,7 @@ void __init init_IRQ(void) unsigned long target_addr; for (index = 0; index < NR_IRQS; ++index) - set_irq_chip_and_handler(index, &score_irq_chip, + irq_set_chip_and_handler(index, &score_irq_chip, handle_level_irq); for (target_addr = IRQ_VECTOR_BASE_ADDR; @@ -136,7 +136,7 @@ int show_interrupts(struct seq_file *p, void *v) seq_printf(p, "%3d: ", i); seq_printf(p, "%10u ", kstat_irqs(i)); - seq_printf(p, " %8s", get_irq_desc_chip(desc)->name ? : "-"); + seq_printf(p, " %8s", irq_desc_get_chip(desc)->name ? : "-"); seq_printf(p, " %s", action->name); for (action = action->next; action; action = action->next) seq_printf(p, ", %s", action->name);