Index: HelenOS.config
===================================================================
--- HelenOS.config	(revision 6eb2e961efe503c8ba03227ff58363688d61d27a)
+++ HelenOS.config	(revision 3cc6a5200ed5c174df3efad1870dab86c9c73d13)
@@ -389,5 +389,8 @@
 
 % Support for Serengeti console
-! [(CONFIG_HID_IN=generic|CONFIG_HID_OUT=generic)&PLATFORM=sparc64&MACHINE=serengeti] CONFIG_SGCN (y/n)
+! [CONFIG_HID_OUT=generic&PLATFORM=sparc64&MACHINE=serengeti] CONFIG_SGCN_PRN (y/n)
+
+% Support for Serengeti keyboard
+! [CONFIG_HID_IN=generic&PLATFORM=sparc64&MACHINE=serengeti] CONFIG_SGCN_KBD (y/n)
 
 % i8042 controller support
@@ -404,5 +407,5 @@
 
 % Serial line input module
-! [CONFIG_DSRLNIN=y|(PLATFORM=ia64&MACHINE=i460GX&CONFIG_NS16550=y)|(PLATFORM=ia64&MACHINE=ski)] CONFIG_SRLN (y)
+! [CONFIG_DSRLNIN=y|(PLATFORM=ia64&MACHINE=i460GX&CONFIG_NS16550=y)|(PLATFORM=ia64&MACHINE=ski)|(PLATFORM=sparc64&MACHINE=serengeti&CONFIG_SGCN_KBD=y)] CONFIG_SRLN (y)
 
 % EGA support
Index: kernel/arch/sparc64/src/console.c
===================================================================
--- kernel/arch/sparc64/src/console.c	(revision 6eb2e961efe503c8ba03227ff58363688d61d27a)
+++ kernel/arch/sparc64/src/console.c	(revision 3cc6a5200ed5c174df3efad1870dab86c9c73d13)
@@ -96,5 +96,5 @@
 	kbrdin = sgcnin_init();
 	if (kbrdin)
-		srlnin_init(kbrdin);
+		srln_init(kbrdin);
 #endif
 #ifdef CONFIG_SGCN_PRN
@@ -135,6 +135,7 @@
 	scr_redraw();
 #endif
+	
 	switch (kbd_type) {
-#ifdef CONFIG_SGCN
+#ifdef CONFIG_SGCN_KBD
 	case KBD_SGCN:
 		sgcn_grab();
@@ -152,5 +153,5 @@
 {
 	switch (kbd_type) {
-#ifdef CONFIG_SGCN
+#ifdef CONFIG_SGCN_KBD
 	case KBD_SGCN:
 		sgcn_release();