Index: kernel/arch/sparc64/src/drivers/kbd.c
===================================================================
--- kernel/arch/sparc64/src/drivers/kbd.c	(revision 0d107f313852cf9ca1abc289a98baf2c22f6c95c)
+++ kernel/arch/sparc64/src/drivers/kbd.c	(revision 7dcf22a389ae4373e29fc2686bf9bae2ac3a8d39)
@@ -41,5 +41,6 @@
 #include <genarch/kbd/ns16550.h>
 #endif
-#include <irq.h>
+#include <ddi/device.h>
+#include <ddi/irq.h>
 #include <arch/mm/page.h>
 #include <arch/types.h>
@@ -118,5 +119,5 @@
 		} else {
 			kbd_irq.inr = inr;
-			kbd_irq.devno = 0;			/* FIXME: assign unique devno */
+			kbd_irq.devno = device_assign_devno();
 			kbd_irq.trigger = IRQ_TRIGGER_LEVEL;
 			kbd_irq.claim = z8530_claim;
@@ -137,5 +138,5 @@
 		} else {
 			kbd_irq.inr = inr;
-			kbd_irq.devno = 0;			/* FIXME: assign unique devno */
+			kbd_irq.devno = device_assign_devno();
 			kbd_irq.trigger = IRQ_TRIGGER_LEVEL;
 			kbd_irq.claim = ns16550_claim;