Index: uspace/srv/kbd/port/sun.c
===================================================================
--- uspace/srv/kbd/port/sun.c	(revision 8d049ee047c5d57ada58879485512cc55e55e918)
+++ uspace/srv/kbd/port/sun.c	(revision f2d2c7ba676ff1a37b6198b134c840dd09e1d11b)
@@ -40,11 +40,4 @@
 #include <sysinfo.h>
 
-typedef enum {
-	KBD_UNKNOWN,
-	KBD_Z8530,
-	KBD_NS16550,
-	KBD_SGCN
-} kbd_type_t;
-
 /** Sun keyboard virtual port driver.
  *
@@ -57,8 +50,13 @@
 int kbd_port_init(void)
 {
-	if (sysinfo_value("kbd.type") == KBD_Z8530)
-		return z8530_port_init();
-	else if (sysinfo_value("kbd.type") == KBD_NS16550)
-		return ns16550_port_init();
+	if (sysinfo_value("kbd.type.z8530")) {
+		if (z8530_port_init() == 0)
+			return 0;
+	}
+	
+	if (sysinfo_value("kbd.type.ns16550")) {
+		if (ns16550_port_init() == 0)
+			return 0;
+	}
 	
 	return -1;