Index: kernel/arch/sparc64/src/console.c
===================================================================
--- kernel/arch/sparc64/src/console.c	(revision 6da1013f00030b5dcedc878f40a0e6242a8d3282)
+++ kernel/arch/sparc64/src/console.c	(revision e7f2ad68c3081b85a41032d60746f0b30111d468)
@@ -142,30 +142,8 @@
 	thread_detach(THREAD);
 
-#ifdef CONFIG_Z8530
-	if (kbd_type == KBD_Z8530) {
-		/*
-		 * The z8530 driver is interrupt-driven.
-		 */
+	if (kbd_type != KBD_SGCN)
 		return;
-	}
-#endif
-
-#ifdef CONFIG_NS16550
-#ifdef CONFIG_NS16550_INTERRUPT_DRIVEN
-	if (kbd_type == KBD_NS16550) {
-		/*
-		 * The ns16550 driver is interrupt-driven.
-		 */
-		return;
-	}
-#endif
-#endif
+
 	while (1) {
-#ifdef CONFIG_NS16550
-#ifndef CONFIG_NS16550_INTERRUPT_DRIVEN
-		if (kbd_type == KBD_NS16550)
-			ns16550_poll();
-#endif
-#endif
 #ifdef CONFIG_SGCN
 		if (kbd_type == KBD_SGCN)
Index: kernel/arch/sparc64/src/sparc64.c
===================================================================
--- kernel/arch/sparc64/src/sparc64.c	(revision 6da1013f00030b5dcedc878f40a0e6242a8d3282)
+++ kernel/arch/sparc64/src/sparc64.c	(revision e7f2ad68c3081b85a41032d60746f0b30111d468)
@@ -104,5 +104,4 @@
 	static thread_t *t = NULL;
 
-
 	if (!t) {
 		/*