Index: kernel/genarch/src/kbd/i8042.c
===================================================================
--- kernel/genarch/src/kbd/i8042.c	(revision c43b1db2edde4d557f57179bffa715c2a6aac1ae)
+++ kernel/genarch/src/kbd/i8042.c	(revision bc18d63b733703c3262a3a720f92513621962cff)
@@ -1,4 +1,4 @@
 /*
- * Copyright (c) 2001-2004 Jakub Jermar
+ * Copyright (c) 2009 Jakub Jermar
  * All rights reserved.
  *
@@ -49,5 +49,4 @@
 #include <console/console.h>
 #include <interrupt.h>
-#include <sysinfo/sysinfo.h>
 
 /* Keyboard commands. */
@@ -149,15 +148,4 @@
 		(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, devno);
-	sysinfo_set_item_val("kbd.inr", NULL, inr);
-#ifdef KBD_LEGACY
-	sysinfo_set_item_val("kbd.type", NULL, KBD_LEGACY);
-#endif
-
 	return true;
 }
Index: kernel/genarch/src/kbd/ns16550.c
===================================================================
--- kernel/genarch/src/kbd/ns16550.c	(revision c43b1db2edde4d557f57179bffa715c2a6aac1ae)
+++ kernel/genarch/src/kbd/ns16550.c	(revision bc18d63b733703c3262a3a720f92513621962cff)
@@ -1,4 +1,4 @@
 /*
- * Copyright (c) 2001-2006 Jakub Jermar
+ * Copyright (c) 2009 Jakub Jermar
  * All rights reserved.
  *
@@ -48,5 +48,4 @@
 #include <interrupt.h>
 #include <arch/interrupt.h>
-#include <sysinfo/sysinfo.h>
 #include <synch/spinlock.h>
 #include <mm/slab.h>
@@ -105,15 +104,4 @@
 		(void) pio_read_8(&dev->rbr);
 	
-	/*
-	 * 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.type", NULL, KBD_NS16550);
-	sysinfo_set_item_val("kbd.devno", NULL, devno);
-	sysinfo_set_item_val("kbd.inr", NULL, inr);
-	sysinfo_set_item_val("kbd.address.virtual", NULL, (uintptr_t) dev);
-	sysinfo_set_item_val("kbd.port", NULL, (uintptr_t) dev);
-	
 	/* Enable interrupts */
 	pio_write_8(&dev->ier, IER_ERBFI);
Index: kernel/genarch/src/kbd/z8530.c
===================================================================
--- kernel/genarch/src/kbd/z8530.c	(revision c43b1db2edde4d557f57179bffa715c2a6aac1ae)
+++ kernel/genarch/src/kbd/z8530.c	(revision bc18d63b733703c3262a3a720f92513621962cff)
@@ -1,4 +1,4 @@
 /*
- * Copyright (c) 2001-2004 Jakub Jermar
+ * Copyright (c) 2009 Jakub Jermar
  * All rights reserved.
  *
@@ -42,5 +42,4 @@
 #include <console/console.h>
 #include <console/chardev.h>
-#include <sysinfo/sysinfo.h>
 #include <ddi/irq.h>
 #include <arch/asm.h>
@@ -123,14 +122,4 @@
 	z8530_write(&dev->ctl_a, WR9, WR9_MIE);
 
-	/*
-	 * This is the necessary evil until the userspace drivers are entirely
-	 * self-sufficient.
-	 */
-	sysinfo_set_item_val("kbd", NULL, true);
-	sysinfo_set_item_val("kbd.type", NULL, KBD_Z8530);
-	sysinfo_set_item_val("kbd.devno", NULL, devno);
-	sysinfo_set_item_val("kbd.inr", NULL, inr);
-	sysinfo_set_item_val("kbd.address.virtual", NULL, (uintptr_t) dev);
-
 	return true;
 }