Index: uspace/srv/kbd/Makefile
===================================================================
--- uspace/srv/kbd/Makefile	(revision 24ff4df07b987c77595be599054e03ca51ab8264)
+++ uspace/srv/kbd/Makefile	(revision 96f392ca08b03b2323335c9f0f75a95214292e95)
@@ -111,53 +111,7 @@
 ifeq ($(UARCH), sparc64)
 	GENARCH_SOURCES += \
-		port/z8350.c \
+		port/z8530.c \
 		ctl/sun.c
 endif
-
-# ifeq ($(UARCH), ia32)
-# 	ARCH_SOURCES += \
-# 		arch/$(UARCH)/src/mouse.c \
-# 		arch/$(UARCH)/src/scanc.c
-# 	GENARCH_SOURCES = \
-# 		genarch/src/kbd.c
-# 	CFLAGS += -DMOUSE_ENABLED
-# endif
-# ifeq ($(UARCH), ia64)
-# 	ARCH_SOURCES += \
-# 		arch/$(UARCH)/src/mouse.c \
-# 		arch/$(UARCH)/src/scanc.c \
-# 		arch/$(UARCH)/src/lkbd.c
-# 	GENARCH_SOURCES = \
-# 		genarch/src/kbd.c
-# 	CFLAGS += -DMOUSE_ENABLED
-# endif
-# ifeq ($(UARCH), amd64)
-# 	ARCH_SOURCES += \
-# 		arch/$(UARCH)/src/mouse.c \
-# 		arch/$(UARCH)/src/scanc.c
-# 	GENARCH_SOURCES = \
-# 		genarch/src/kbd.c
-# 	CFLAGS += -DMOUSE_ENABLED
-# endif
-# ifeq ($(UARCH), sparc64)
-# 	ARCH_SOURCES += \
-# 		arch/$(UARCH)/src/scanc.c \
-# 		arch/$(UARCH)/src/sgcn.c
-# 	GENARCH_SOURCES = \
-# 		genarch/src/kbd.c \
-# 		genarch/src/nofb.c
-# endif
-# ifeq ($(UARCH), arm32)
-# 	ARCH_SOURCES += \
-# 		arch/$(UARCH)/src/kbd_gxemul.c
-# endif
-# ifeq ($(UARCH), mips32)
-# 	GENARCH_SOURCES += \
-# 	    genarch/src/nofb.c
-# endif
-# ifeq ($(UARCH), mips32eb)
-# 	GENARCH_SOURCES += \
-# 	    genarch/src/nofb.c
-# endif
 
 GENERIC_OBJECTS := $(addsuffix .o,$(basename $(GENERIC_SOURCES)))
Index: uspace/srv/kbd/port/sgcn.c
===================================================================
--- uspace/srv/kbd/port/sgcn.c	(revision 24ff4df07b987c77595be599054e03ca51ab8264)
+++ uspace/srv/kbd/port/sgcn.c	(revision 96f392ca08b03b2323335c9f0f75a95214292e95)
@@ -32,5 +32,4 @@
  */ 
 /** @file
- * @brief	Z8350 keyboard port driver.
  * @brief	SGCN (Serengeti Console) keyboard port driver.
  */
Index: uspace/srv/kbd/port/z8530.c
===================================================================
--- uspace/srv/kbd/port/z8530.c	(revision 24ff4df07b987c77595be599054e03ca51ab8264)
+++ uspace/srv/kbd/port/z8530.c	(revision 96f392ca08b03b2323335c9f0f75a95214292e95)
@@ -32,5 +32,5 @@
  */ 
 /** @file
- * @brief	Z8350 keyboard port driver.
+ * @brief	Z8530 keyboard port driver.
  */
 
@@ -62,5 +62,5 @@
 int kbd_port_init(void)
 {
-	async_set_interrupt_received(z8350_irq_handler);
+	async_set_interrupt_received(z8530_irq_handler);
 	z8530_cmds[0].addr = (void *) sysinfo_value("kbd.address.virtual") + 6;
 	ipc_register_irq(sysinfo_value("kbd.inr"), sysinfo_value("kbd.devno"),