Index: kernel/arch/amd64/src/amd64.c
===================================================================
--- kernel/arch/amd64/src/amd64.c	(revision 65513a5ce7ed4c4905b958d303094f168b7df063)
+++ kernel/arch/amd64/src/amd64.c	(revision db90860fdc1d47aaec8d1e18be364a1835f99b85)
@@ -66,5 +66,4 @@
 #include <console/console.h>
 #include <ddi/irq.h>
-#include <ddi/device.h>
 #include <sysinfo/sysinfo.h>
 
@@ -195,11 +194,9 @@
 {
 #ifdef CONFIG_PC_KBD
-	devno_t devno = device_assign_devno();
-	
 	/*
 	 * Initialize the i8042 controller. Then initialize the keyboard
 	 * module and connect it to i8042. Enable keyboard interrupts.
 	 */
-	indev_t *kbrdin = i8042_init((i8042_t *) I8042_BASE, devno, IRQ_KBD);
+	indev_t *kbrdin = i8042_init((i8042_t *) I8042_BASE, IRQ_KBD);
 	if (kbrdin) {
 		kbrd_init(kbrdin);
@@ -212,5 +209,4 @@
 	 */
 	sysinfo_set_item_val("kbd", NULL, true);
-	sysinfo_set_item_val("kbd.devno", NULL, devno);
 	sysinfo_set_item_val("kbd.inr", NULL, IRQ_KBD);
 	sysinfo_set_item_val("kbd.address.physical", NULL,