Index: kern/kern_intr.c
===================================================================
RCS file: /usr/cvs/src/sys/kern/kern_intr.c,v
retrieving revision 1.124.2.2
diff -u -r1.124.2.2 kern_intr.c
--- kern/kern_intr.c	10 Mar 2006 19:37:33 -0000	1.124.2.2
+++ kern/kern_intr.c	15 Mar 2006 18:09:33 -0000
@@ -614,6 +614,7 @@
 }
 
 /* ABI compatibility shim. */
+#undef ithread_remove_handler
 int	ithread_remove_handler(void *);
 
 int
Index: sys/interrupt.h
===================================================================
RCS file: /usr/cvs/src/sys/sys/interrupt.h,v
retrieving revision 1.30.2.1
diff -u -r1.30.2.1 interrupt.h
--- sys/interrupt.h	10 Mar 2006 19:37:35 -0000	1.30.2.1
+++ sys/interrupt.h	15 Mar 2006 18:10:09 -0000
@@ -36,6 +36,7 @@
 #define	tty_intr_event	tty_ithd
 #define	clk_intr_event	clk_ithd
 #define	ithd		intr_event
+#define	ithread_remove_handler	intr_event_remove_handler
 
 struct intr_event;
 struct intr_thread;