--- zzzz-none-000/linux-2.6.19.2/arch/ia64/kernel/iosapic.c	2007-01-10 19:10:37.000000000 +0000
+++ davinci-8020-5505/linux-2.6.19.2/arch/ia64/kernel/iosapic.c	2007-01-11 07:38:19.000000000 +0000
@@ -426,7 +426,7 @@
 #define iosapic_ack_level_irq		nop
 
 struct hw_interrupt_type irq_type_iosapic_level = {
-	.name =		"IO-SAPIC-level",
+	.typename =	"IO-SAPIC-level",
 	.startup =	iosapic_startup_level_irq,
 	.shutdown =	iosapic_shutdown_level_irq,
 	.enable =	iosapic_enable_level_irq,
@@ -473,7 +473,7 @@
 #define iosapic_end_edge_irq		nop
 
 struct hw_interrupt_type irq_type_iosapic_edge = {
-	.name =		"IO-SAPIC-edge",
+	.typename =	"IO-SAPIC-edge",
 	.startup =	iosapic_startup_edge_irq,
 	.shutdown =	iosapic_disable_edge_irq,
 	.enable =	iosapic_enable_edge_irq,
@@ -664,7 +664,7 @@
 			printk(KERN_WARNING
 			       "%s: changing vector %d from %s to %s\n",
 			       __FUNCTION__, vector,
-			       idesc->chip->name, irq_type->name);
+			       idesc->chip->typename, irq_type->typename);
 		idesc->chip = irq_type;
 	}
 	return 0;