diff --git a/sys/arch/arm/xscale/becc_icu.c b/sys/arch/arm/xscale/becc_icu.c
index b8f26efc07d6..bab73e688444 100644
--- a/sys/arch/arm/xscale/becc_icu.c
+++ b/sys/arch/arm/xscale/becc_icu.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: becc_icu.c,v 1.3 2003/07/15 00:24:52 lukem Exp $	*/
+/*	$NetBSD: becc_icu.c,v 1.4 2005/08/14 19:23:17 he Exp $	*/
 
 /*
  * Copyright (c) 2002 Wasabi Systems, Inc.
@@ -40,7 +40,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: becc_icu.c,v 1.3 2003/07/15 00:24:52 lukem Exp $");
+__KERNEL_RCSID(0, "$NetBSD: becc_icu.c,v 1.4 2005/08/14 19:23:17 he Exp $");
 
 #ifndef EVBARM_SPL_NOINLINE
 #define	EVBARM_SPL_NOINLINE
@@ -121,7 +121,7 @@ const char *becc_irqnames[] = {
 	"irq 31",
 };
 
-void	becc_intr_dispatch(struct clockframe *frame);
+void	becc_intr_dispatch(struct irqframe *frame);
 
 static __inline uint32_t
 becc_icsr_read(void)
@@ -452,7 +452,7 @@ becc_intr_disestablish(void *cookie)
 }
 
 void
-becc_intr_dispatch(struct clockframe *frame)
+becc_intr_dispatch(struct irqframe *frame)
 {
 	struct intrq *iq;
 	struct intrhand *ih;
diff --git a/sys/arch/arm/xscale/i80200_icu.c b/sys/arch/arm/xscale/i80200_icu.c
index 9eb3d1e3e8f0..418a4cefa175 100644
--- a/sys/arch/arm/xscale/i80200_icu.c
+++ b/sys/arch/arm/xscale/i80200_icu.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: i80200_icu.c,v 1.6 2003/07/15 00:24:52 lukem Exp $	*/
+/*	$NetBSD: i80200_icu.c,v 1.7 2005/08/14 19:23:17 he Exp $	*/
 
 /*
  * Copyright (c) 2002 Wasabi Systems, Inc.
@@ -40,7 +40,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: i80200_icu.c,v 1.6 2003/07/15 00:24:52 lukem Exp $");
+__KERNEL_RCSID(0, "$NetBSD: i80200_icu.c,v 1.7 2005/08/14 19:23:17 he Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -54,10 +54,10 @@ __KERNEL_RCSID(0, "$NetBSD: i80200_icu.c,v 1.6 2003/07/15 00:24:52 lukem Exp $")
 static __volatile uint32_t intctl;
 
 /* Pointer to board-specific external IRQ dispatcher. */
-void	(*i80200_extirq_dispatch)(struct clockframe *);
+void	(*i80200_extirq_dispatch)(struct irqframe *);
 
 static void
-i80200_default_extirq_dispatch(struct clockframe *framep)
+i80200_default_extirq_dispatch(struct irqframe *framep)
 {
 
 	panic("external IRQ with no dispatch routine");
diff --git a/sys/arch/evbarm/iq80310/iq80310_intr.c b/sys/arch/evbarm/iq80310/iq80310_intr.c
index ae5e123c0c18..3a2cc58e26ca 100644
--- a/sys/arch/evbarm/iq80310/iq80310_intr.c
+++ b/sys/arch/evbarm/iq80310/iq80310_intr.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: iq80310_intr.c,v 1.20 2003/07/15 00:25:02 lukem Exp $	*/
+/*	$NetBSD: iq80310_intr.c,v 1.21 2005/08/14 19:23:17 he Exp $	*/
 
 /*
  * Copyright (c) 2001, 2002 Wasabi Systems, Inc.
@@ -36,7 +36,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: iq80310_intr.c,v 1.20 2003/07/15 00:25:02 lukem Exp $");
+__KERNEL_RCSID(0, "$NetBSD: iq80310_intr.c,v 1.21 2005/08/14 19:23:17 he Exp $");
 
 #ifndef EVBARM_SPL_NOINLINE
 #define	EVBARM_SPL_NOINLINE
@@ -95,7 +95,7 @@ static const int si_to_ipl[SI_NQUEUES] = {
 	IPL_SOFTSERIAL,		/* SI_SOFTSERIAL */
 };
 
-void	iq80310_intr_dispatch(struct clockframe *frame);
+void	iq80310_intr_dispatch(struct irqframe *frame);
 
 static __inline uint32_t
 iq80310_intstat_read(void)
@@ -408,7 +408,7 @@ iq80310_intr_disestablish(void *cookie)
 }
 
 void
-iq80310_intr_dispatch(struct clockframe *frame)
+iq80310_intr_dispatch(struct irqframe *frame)
 {
 	struct intrq *iq;
 	struct intrhand *ih;