--- zzzz-none-000/linux-2.6.19.2/arch/ia64/kernel/irq.c	2007-01-10 19:10:37.000000000 +0000
+++ davinci-8020-5505/linux-2.6.19.2/arch/ia64/kernel/irq.c	2007-01-11 07:38:19.000000000 +0000
@@ -76,7 +76,7 @@
 			seq_printf(p, "%10u ", kstat_cpu(j).irqs[i]);
 		}
 #endif
-		seq_printf(p, " %14s", irq_desc[i].chip->name);
+		seq_printf(p, " %14s", irq_desc[i].chip->typename);
 		seq_printf(p, "  %s", action->name);
 
 		for (action=action->next; action; action = action->next)
@@ -197,7 +197,7 @@
 			struct pt_regs *old_regs = set_irq_regs(NULL);
 
 			vectors_in_migration[irq]=0;
-			generic_handle_irq(irq);
+			__do_IRQ(irq);
 			set_irq_regs(old_regs);
 		}
 	}