From: Andrew Morton <akpm@osdl.org>

Cc: KAMEZAWA Hiroyuki <kamezawa.hiroyu@jp.fujitsu.com>
Cc: Ingo Molnar <mingo@elte.hu>
Signed-off-by: Andrew Morton <akpm@osdl.org>
---

 arch/ia64/kernel/machine_kexec.c |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff -puN arch/ia64/kernel/machine_kexec.c~genirq-rename-desc-handler-to-desc-chip-ia64-fix-2 arch/ia64/kernel/machine_kexec.c
--- 25/arch/ia64/kernel/machine_kexec.c~genirq-rename-desc-handler-to-desc-chip-ia64-fix-2	Wed May 24 12:43:02 2006
+++ 25-akpm/arch/ia64/kernel/machine_kexec.c	Wed May 24 12:43:21 2006
@@ -71,8 +71,8 @@ void machine_shutdown(void)
 			continue;
 		cpu_set(0, mask);
 		disable_irq_nosync(dev->irq);
-		idesc->handler->end(dev->irq);
-		idesc->handler->set_affinity(dev->irq, mask);
+		idesc->chip->end(dev->irq);
+		idesc->chip->set_affinity(dev->irq, mask);
 		idesc->action = NULL;
 		pci_disable_device(dev);
 	}
_