Index: arch/ia64/src/drivers/it.c
===================================================================
--- arch/ia64/src/drivers/it.c	(revision 4a28943658bd8e80c365754d9d3a95c56c582b17)
+++ arch/ia64/src/drivers/it.c	(revision 902fb856d1931fcf547fdb933b2933b0d2f6474d)
@@ -30,4 +30,5 @@
  
 #include <arch/drivers/it.h>
+#include <arch/drivers/keyboard.h>
 #include <arch/interrupt.h>
 #include <arch/register.h>
@@ -36,5 +37,4 @@
 #include <time/clock.h>
 
-void keyboard(void);
 
 /** Initialize Interval Timer. */
@@ -66,4 +66,4 @@
 	srlz_d();				/* propagate changes */
 	clock();
-	keyboard();
+	poll_keyboard();
 }
Index: arch/ia64/src/drivers/keyboard.c
===================================================================
--- arch/ia64/src/drivers/keyboard.c	(revision 4a28943658bd8e80c365754d9d3a95c56c582b17)
+++ arch/ia64/src/drivers/keyboard.c	(revision 902fb856d1931fcf547fdb933b2933b0d2f6474d)
@@ -2,4 +2,5 @@
  * Copyright (C) 2003 Josef Cejka
  * Copyright (C) 2005 Jakub Jermar
+ * Copyright (C) 2005 Jakub Vana
  * All rights reserved.
  *
@@ -55,9 +56,9 @@
 	chardev_initialize(&kbrd, &ops);
 	stdin = &kbrd;
-	kb_disable = 0;
+	kb_disable = false;
 }
 
 /** Process keyboard interrupt. */
-void keyboard(void)
+void poll_keyboard(void)
 {
 	if(kb_disable) return;
@@ -65,5 +66,5 @@
 
 	ch = ski_getchar();
-	if(ch==13) ch=10; 
+	if(ch=='\r') ch='\n'; 
 	if(ch) chardev_push_character(&kbrd, ch);
 	
@@ -73,5 +74,5 @@
 void keyboard_enable(void)
 {
-	kb_disable=0;
+	kb_disable=false;
 }
 
@@ -79,4 +80,4 @@
 void keyboard_disable(void)
 {
-	kb_disable=1;	
+	kb_disable=true;	
 }