Index: kernel/arch/sparc64/src/trap/interrupt.c
===================================================================
--- kernel/arch/sparc64/src/trap/interrupt.c	(revision e3890b3fce4ad7f968cc0c569c3565b3df89e8c8)
+++ kernel/arch/sparc64/src/trap/interrupt.c	(revision 8513ad77da21520006dc3e18de1e95a2b6f59c6f)
@@ -40,5 +40,4 @@
 #include <arch/types.h>
 #include <debug.h>
-#include <ipc/sysipc.h>
 #include <arch/asm.h>
 #include <arch/barrier.h>
@@ -48,10 +47,4 @@
 #include <config.h>
 #include <synch/spinlock.h>
-
-/*
- * To be removed once we get rid of the dependency in ipc_irq_bind_arch().
- */
-#include <arch/drivers/kbd.h>
-#include <genarch/kbd/z8530.h>
 
 /** Register Interrupt Level Handler.
@@ -66,13 +59,4 @@
 	
 	exc_register(n - 1, name, f);
-}
-
-/* Reregister irq to be IPC-ready */
-void irq_ipc_bind_arch(unative_t irq)
-{
-#ifdef CONFIG_Z8530
-	if (kbd_type == KBD_Z8530)
-		z8530_belongs_to_kernel = false;
-#endif
 }