Index: kernel/arch/amd64/src/amd64.c
===================================================================
--- kernel/arch/amd64/src/amd64.c	(revision f9f9a132b6bbf6fb3fbfbc90aa2f576c0bf1b017)
+++ kernel/arch/amd64/src/amd64.c	(revision 5b0ae4be433e6e0f6a10edce86935785f9423e0d)
@@ -175,5 +175,6 @@
 {
 	/* keyboard controller */
-	i8042_init(device_assign_devno(), IRQ_KBD, device_assign_devno(), IRQ_MOUSE);
+	(void) i8042_init((i8042_t *) I8042_BASE, device_assign_devno(),
+	    IRQ_KBD);
 }
 
Index: kernel/arch/ia32/src/ia32.c
===================================================================
--- kernel/arch/ia32/src/ia32.c	(revision f9f9a132b6bbf6fb3fbfbc90aa2f576c0bf1b017)
+++ kernel/arch/ia32/src/ia32.c	(revision 5b0ae4be433e6e0f6a10edce86935785f9423e0d)
@@ -126,7 +126,6 @@
 {
 	devno_t kbd = device_assign_devno();
-	devno_t mouse = device_assign_devno();
 	/* keyboard controller */
-	i8042_init(kbd, IRQ_KBD, mouse, IRQ_MOUSE);
+	(void) i8042_init((i8042_t *) I8042_BASE, kbd, IRQ_KBD);
 }
 
Index: kernel/arch/ia64/src/ia64.c
===================================================================
--- kernel/arch/ia64/src/ia64.c	(revision f9f9a132b6bbf6fb3fbfbc90aa2f576c0bf1b017)
+++ kernel/arch/ia64/src/ia64.c	(revision 5b0ae4be433e6e0f6a10edce86935785f9423e0d)
@@ -167,6 +167,5 @@
 	     NULL);
 #else
-	devno_t mouse = device_assign_devno();
-	i8042_init(kbd, IRQ_KBD, mouse, IRQ_MOUSE);
+	(void) i8042_init((i8042_t *)I8042_BASE, kbd, IRQ_KBD);
 #endif
 #endif
@@ -223,10 +222,4 @@
 #ifdef SKI
 	ski_kbd_grab();
-#else
-#ifdef CONFIG_NS16550
-	ns16550_grab();
-#else
-	i8042_grab();
-#endif
 #endif
 }
@@ -239,10 +232,4 @@
 #ifdef SKI
 	ski_kbd_release();
-#else
-#ifdef CONFIG_NS16550
-	ns16550_release();
-#else
-	i8042_release();
-#endif
 #endif
 }