Index: kernel/genarch/src/kbd/i8042.c
===================================================================
--- kernel/genarch/src/kbd/i8042.c	(revision cecb07892c77b379e9e44411c961635f85a64910)
+++ kernel/genarch/src/kbd/i8042.c	(revision d063365758316e717c09ea0784daba4b65d674de)
@@ -50,5 +50,4 @@
 #include <interrupt.h>
 #include <sysinfo/sysinfo.h>
-#include <ipc/irq.h>
 
 i8042_instance_t lgcy_i8042_instance = {
@@ -157,12 +156,12 @@
 	/*
 	 * Clear input buffer.
-	 * Number of iterations is limited to prevent infinite looping.
 	 */
-	int i;
-	for (i = 0; (pio_read_8(&dev->status) & i8042_BUFFER_FULL_MASK) &&
-	    i < 100; i++) {
+	while (pio_read_8(&dev->status) & i8042_BUFFER_FULL_MASK)
 		(void) pio_read_8(&dev->data);
-	}
 	
+	/*
+	 * This is the necessary evil until the userspace driver is entirely
+	 * self-sufficient.
+	 */
 	sysinfo_set_item_val("kbd", NULL, true);
 	sysinfo_set_item_val("kbd.devno", NULL, kbd_devno);