Index: kernel/arch/sparc64/src/console.c
===================================================================
--- kernel/arch/sparc64/src/console.c	(revision c9b550bff53b2109d2746935072fca1bbe632894)
+++ kernel/arch/sparc64/src/console.c	(revision 0f74869b097948cf47305f47d532161682eac285)
@@ -163,14 +163,4 @@
 #endif
 	switch (kbd_type) {
-#ifdef CONFIG_Z8530
-	case KBD_Z8530:
-		z8530_grab();
-		break;
-#endif
-#ifdef CONFIG_NS16550
-	case KBD_NS16550:
-		ns16550_grab();
-		break;
-#endif
 #ifdef CONFIG_SGCN
 	case KBD_SGCN:
@@ -189,14 +179,4 @@
 {
 	switch (kbd_type) {
-#ifdef CONFIG_Z8530
-	case KBD_Z8530:
-		z8530_release();
-		break;
-#endif
-#ifdef CONFIG_NS16550
-	case KBD_NS16550:
-		ns16550_release();
-		break;
-#endif
 #ifdef CONFIG_SGCN
 	case KBD_SGCN:
Index: kernel/arch/sparc64/src/drivers/kbd.c
===================================================================
--- kernel/arch/sparc64/src/drivers/kbd.c	(revision c9b550bff53b2109d2746935072fca1bbe632894)
+++ kernel/arch/sparc64/src/drivers/kbd.c	(revision 0f74869b097948cf47305f47d532161682eac285)
@@ -149,6 +149,7 @@
 #ifdef CONFIG_Z8530
 	case KBD_Z8530:
-		z8530_init(device_assign_devno(),
-		    hw_map(aligned_addr, offset + size) + offset, inr, cir, cir_arg);
+		(void) z8530_init((z8530_t *) hw_map(aligned_addr,
+		    offset + size) + offset, device_assign_devno(), inr, cir,
+		    cir_arg);
 		break;
 #endif
Index: kernel/arch/sparc64/src/drivers/sgcn.c
===================================================================
--- kernel/arch/sparc64/src/drivers/sgcn.c	(revision c9b550bff53b2109d2746935072fca1bbe632894)
+++ kernel/arch/sparc64/src/drivers/sgcn.c	(revision 0f74869b097948cf47305f47d532161682eac285)
@@ -382,11 +382,5 @@
 	
 	if (*in_rdptr_ptr != *in_wrptr_ptr) {
-		if (sgcn_irq.notif_cfg.notify && sgcn_irq.notif_cfg.answerbox) {
-			ipc_irq_send_notif(&sgcn_irq);
-			spinlock_unlock(&sgcn_irq.lock);
-			interrupts_restore(ipl);
-			spinlock_unlock(&sgcn_input_lock);
-			return;
-		}
+		/* XXX: send notification to userspace */
 	}