---

yaml --- r: 243037 b: refs/heads/master c: 9913535 h: refs/heads/master i: 243035: 6cc9ad0 v: v3
git-mirror · Mar 28, 2011 · 726610c · 726610c
1 parent 8644c78
commit 726610c
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git 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
@@ -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);