Index: arch/ia64/Makefile.inc
===================================================================
--- arch/ia64/Makefile.inc	(revision 6e716a598c8f3711bdf36090c90f37e5a5948fb0)
+++ arch/ia64/Makefile.inc	(revision 72f5866d024b9caad084cece4024c1293f3ba11f)
@@ -47,5 +47,4 @@
 	arch/$(ARCH)/src/asm.S \
 	arch/$(ARCH)/src/dummy.s \
-	arch/$(ARCH)/src/putchar.c \
 	arch/$(ARCH)/src/ia64.c \
 	arch/$(ARCH)/src/fpu_context.c \
@@ -57,4 +56,3 @@
 	arch/$(ARCH)/src/fmath.c \
 	arch/$(ARCH)/src/mm/frame.c \
-	arch/$(ARCH)/src/drivers/it.c \
-	arch/$(ARCH)/src/drivers/keyboard.c
+	arch/$(ARCH)/src/drivers/it.c
Index: arch/ia64/include/ski/ski.h
===================================================================
--- arch/ia64/include/ski/ski.h	(revision 6e716a598c8f3711bdf36090c90f37e5a5948fb0)
+++ arch/ia64/include/ski/ski.h	(revision 72f5866d024b9caad084cece4024c1293f3ba11f)
@@ -32,5 +32,4 @@
 #include <arch/types.h>
 
-
 #define SKI_INIT_CONSOLE	20
 #define SKI_GETCHAR		21
@@ -39,4 +38,4 @@
 extern void ski_init_console(void);
 extern void poll_keyboard(void);
-	
+
 #endif
Index: arch/ia64/src/interrupt.c
===================================================================
--- arch/ia64/src/interrupt.c	(revision 6e716a598c8f3711bdf36090c90f37e5a5948fb0)
+++ arch/ia64/src/interrupt.c	(revision 72f5866d024b9caad084cece4024c1293f3ba11f)
@@ -32,4 +32,5 @@
 #include <panic.h>
 #include <print.h>
+#include <console/console.h>
 #include <arch/types.h>
 #include <arch/asm.h>
Index: arch/ia64/src/putchar.c
===================================================================
--- arch/ia64/src/putchar.c	(revision 6e716a598c8f3711bdf36090c90f37e5a5948fb0)
+++ arch/ia64/src/putchar.c	(revision 72f5866d024b9caad084cece4024c1293f3ba11f)
@@ -32,4 +32,4 @@
 void putchar(const char ch)
 {
-	ski_putchar(ch);
+	ski_write(ch);
 }
Index: arch/ia64/src/ski/ski.c
===================================================================
--- arch/ia64/src/ski/ski.c	(revision 6e716a598c8f3711bdf36090c90f37e5a5948fb0)
+++ arch/ia64/src/ski/ski.c	(revision 72f5866d024b9caad084cece4024c1293f3ba11f)
@@ -34,4 +34,7 @@
 static bool kb_disable;
 
+static void ski_write(chardev_t *d, const char ch);
+static __s32 ski_getchar(void);
+
 /** Display character on debug console
  *
@@ -39,5 +42,6 @@
  * display character on debug console.
  *
- * @param ch   Character to be printed.
+ * @param d Character device.
+ * @param ch Character to be printed.
  */
 void ski_write(chardev_t *d, const char ch)
@@ -52,5 +56,6 @@
 	);
 	
-	if (ch == '\n') ski_putchar('\r');
+	if (ch == '\n')
+		ski_write(d, '\r');
 }
 
@@ -97,5 +102,5 @@
 
 /* Called from getc(). */
-static void ski_kb_enable(chardev_t *)
+static void ski_kb_enable(chardev_t *d)
 {
 	kb_disable = false;