Index: kernel/arch/mips32/src/drivers/msim.c
===================================================================
--- kernel/arch/mips32/src/drivers/msim.c	(revision c9b550bff53b2109d2746935072fca1bbe632894)
+++ kernel/arch/mips32/src/drivers/msim.c	(revision 691eb5227bb3faa6ab7918931f4c859c75819ec1)
@@ -34,5 +34,4 @@
 
 #include <interrupt.h>
-#include <ipc/irq.h>
 #include <console/chardev.h>
 #include <arch/drivers/msim.h>
@@ -96,16 +95,12 @@
 static void msim_irq_handler(irq_t *irq)
 {
-	if ((irq->notif_cfg.notify) && (irq->notif_cfg.answerbox))
-		ipc_irq_send_notif(irq);
-	else {
-		char ch = 0;
+	char ch = 0;
 		
-		ch = *((char *) MSIM_KBD_ADDRESS);
-		if (ch =='\r')
-			ch = '\n';
-		if (ch == 0x7f)
-			ch = '\b';
-		chardev_push_character(&console, ch);
-	}
+	ch = *((char *) MSIM_KBD_ADDRESS);
+	if (ch =='\r')
+		ch = '\n';
+	if (ch == 0x7f)
+		ch = '\b';
+	chardev_push_character(&console, ch);
 }
 
Index: kernel/arch/mips32/src/drivers/serial.c
===================================================================
--- kernel/arch/mips32/src/drivers/serial.c	(revision c9b550bff53b2109d2746935072fca1bbe632894)
+++ kernel/arch/mips32/src/drivers/serial.c	(revision 691eb5227bb3faa6ab7918931f4c859c75819ec1)
@@ -35,5 +35,4 @@
 #include <interrupt.h>
 #include <arch/cp0.h>
-#include <ipc/irq.h>
 #include <arch/drivers/serial.h>
 #include <console/chardev.h>
@@ -115,8 +114,5 @@
 static void serial_irq_handler(irq_t *irq)
 {
-	if ((irq->notif_cfg.notify) && (irq->notif_cfg.answerbox))
-		ipc_irq_send_notif(irq);
-	else
-		serial_handler();
+	serial_handler();
 }