Index: kernel/arch/sparc64/src/drivers/kbd.c
===================================================================
--- kernel/arch/sparc64/src/drivers/kbd.c	(revision f6377f722eaf2e019d585b85b3ffc5620c32f2bd)
+++ kernel/arch/sparc64/src/drivers/kbd.c	(revision 7dfc120ad2ac14e97b041f8da4a10c117dfa4b1b)
@@ -47,5 +47,4 @@
 
 #include <console/console.h>
-#include <ddi/device.h>
 #include <ddi/irq.h>
 #include <arch/mm/page.h>
@@ -75,5 +74,5 @@
 	cir_t cir;
 	void *cir_arg;
-
+	
 #ifdef CONFIG_NS16550
 	ns16550_t *ns16550;
@@ -116,5 +115,4 @@
 	uintptr_t pa;
 	size_t size;
-	devno_t devno;
 	inr_t inr;
 	
@@ -165,9 +163,8 @@
 #ifdef CONFIG_Z8530
 	case KBD_Z8530:
-		devno = device_assign_devno();
 		z8530 = (z8530_t *) hw_map(aligned_addr, offset + size) +
 		    offset;
 		
-		indev_t *kbrdin_z8530 = z8530_init(z8530, devno, inr, cir, cir_arg);
+		indev_t *kbrdin_z8530 = z8530_init(z8530, inr, cir, cir_arg);
 		if (kbrdin_z8530)
 			kbrd_init(kbrdin_z8530);
@@ -179,5 +176,4 @@
 		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.kernel", NULL,
@@ -188,9 +184,8 @@
 #ifdef CONFIG_NS16550
 	case KBD_NS16550:
-		devno = device_assign_devno();
 		ns16550 = (ns16550_t *) hw_map(aligned_addr, offset + size) +
 		    offset;
 		
-		indev_t *kbrdin_ns16550 = ns16550_init(ns16550, devno, inr, cir, cir_arg);
+		indev_t *kbrdin_ns16550 = ns16550_init(ns16550, inr, cir, cir_arg);
 		if (kbrdin_ns16550)
 			kbrd_init(kbrdin_ns16550);
@@ -202,5 +197,4 @@
 		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.kernel", NULL,