Index: kernel/genarch/src/kbd/i8042.c
===================================================================
--- kernel/genarch/src/kbd/i8042.c	(revision 06e1e95342d7b9a9c85c7492529a309d51a3fb6c)
+++ kernel/genarch/src/kbd/i8042.c	(revision b44939b3e96b45459ade4081b45ffb74c843202e)
@@ -81,9 +81,8 @@
 static void i8042_resume(chardev_t *);
 
-chardev_t kbrd;
 static chardev_operations_t ops = {
 	.suspend = i8042_suspend,
 	.resume = i8042_resume,
-	.read = key_read
+	.read = i8042_key_read
 };
 
@@ -174,5 +173,5 @@
 }
 
-char key_read(chardev_t *d)
+char i8042_key_read(chardev_t *d)
 {
 	char ch;	
Index: kernel/genarch/src/kbd/key.c
===================================================================
--- kernel/genarch/src/kbd/key.c	(revision 06e1e95342d7b9a9c85c7492529a309d51a3fb6c)
+++ kernel/genarch/src/kbd/key.c	(revision b44939b3e96b45459ade4081b45ffb74c843202e)
@@ -54,4 +54,6 @@
 #define ACTIVE_READ_BUFF_SIZE 16 	/* Must be power of 2 */
 
+chardev_t kbrd;
+
 static uint8_t active_read_buff[ACTIVE_READ_BUFF_SIZE];
 
Index: kernel/genarch/src/kbd/ns16550.c
===================================================================
--- kernel/genarch/src/kbd/ns16550.c	(revision 06e1e95342d7b9a9c85c7492529a309d51a3fb6c)
+++ kernel/genarch/src/kbd/ns16550.c	(revision b44939b3e96b45459ade4081b45ffb74c843202e)
@@ -60,9 +60,8 @@
 static void ns16550_resume(chardev_t *);
 
-chardev_t kbrd;
 static chardev_operations_t ops = {
 	.suspend = ns16550_suspend,
 	.resume = ns16550_resume,
-	.read = key_read
+	.read = ns16550_key_read
 };
 
@@ -119,5 +118,5 @@
 }
 
-char key_read(chardev_t *d)
+char ns16550_key_read(chardev_t *d)
 {
 	char ch;	
Index: kernel/genarch/src/kbd/z8530.c
===================================================================
--- kernel/genarch/src/kbd/z8530.c	(revision 06e1e95342d7b9a9c85c7492529a309d51a3fb6c)
+++ kernel/genarch/src/kbd/z8530.c	(revision b44939b3e96b45459ade4081b45ffb74c843202e)
@@ -63,9 +63,8 @@
 static void z8530_resume(chardev_t *);
 
-chardev_t kbrd;
 static chardev_operations_t ops = {
 	.suspend = z8530_suspend,
 	.resume = z8530_resume,
-	.read = key_read
+	.read = z8530_key_read
 };
 
@@ -142,5 +141,5 @@
 }
 
-char key_read(chardev_t *d)
+char z8530_key_read(chardev_t *d)
 {
 	char ch;