Index: HelenOS.config
===================================================================
--- HelenOS.config	(revision 7633928c3dd5a213d06a4fd3739f1ae2e2c661d6)
+++ HelenOS.config	(revision 3c50cddc467c69a1aca1a0b8962eadf05330cf15)
@@ -447,8 +447,8 @@
 
 % Support for msim keyboard
-! [CONFIG_HID_IN=generic&(PLATFORM=mips32|PLATFORM=mips64)] CONFIG_MIPS_KBD (y/n)
+! [CONFIG_HID_IN=generic&MACHINE=msim] CONFIG_MSIM_KBD (y/n)
 
 % Support for msim printer
-! [(CONFIG_HID_OUT=generic|CONFIG_HID_OUT=serial)&(PLATFORM=mips32|PLATFORM=mips64)] CONFIG_MIPS_PRN (y/n)
+! [(CONFIG_HID_OUT=generic|CONFIG_HID_OUT=serial)&MACHINE=msim] CONFIG_MSIM_PRN (y/n)
 
 % Support for VIA CUDA controller
@@ -486,8 +486,8 @@
 
 % Dummy serial line input
-! [CONFIG_MIPS_KBD=y|CONFIG_ARM_KBD=y] CONFIG_DSRLNIN (y)
+! [CONFIG_MSIM_KBD=y|CONFIG_ARM_KBD=y] CONFIG_DSRLNIN (y)
 
 % Dummy serial line output
-! [CONFIG_MIPS_PRN=y|CONFIG_ARM_PRN=y] CONFIG_DSRLNOUT (y)
+! [CONFIG_MSIM_PRN=y|CONFIG_ARM_PRN=y] CONFIG_DSRLNOUT (y)
 
 % Serial line input module
Index: kernel/arch/mips32/src/mips32.c
===================================================================
--- kernel/arch/mips32/src/mips32.c	(revision 7633928c3dd5a213d06a4fd3739f1ae2e2c661d6)
+++ kernel/arch/mips32/src/mips32.c	(revision 3c50cddc467c69a1aca1a0b8962eadf05330cf15)
@@ -46,5 +46,7 @@
 #include <arch/debug.h>
 #include <arch/debugger.h>
+#ifdef MACHINE_msim
 #include <arch/drivers/msim.h>
+#endif
 #include <genarch/fb/fb.h>
 #include <genarch/drivers/dsrln/dsrlnin.h>
@@ -133,5 +135,5 @@
 	interrupt_init();
 	
-#ifdef CONFIG_MIPS_PRN
+#ifdef CONFIG_MSIM_PRN
 	outdev_t *dsrlndev = dsrlnout_init((ioport8_t *) MSIM_KBD_ADDRESS);
 	if (dsrlndev)
@@ -162,5 +164,5 @@
 	    str_size(platform));
 
-#ifdef CONFIG_MIPS_KBD
+#ifdef CONFIG_MSIM_KBD
 	/*
 	 * Initialize the msim keyboard port. Then initialize the serial line
Index: kernel/arch/mips32/src/mm/frame.c
===================================================================
--- kernel/arch/mips32/src/mm/frame.c	(revision 7633928c3dd5a213d06a4fd3739f1ae2e2c661d6)
+++ kernel/arch/mips32/src/mm/frame.c	(revision 3c50cddc467c69a1aca1a0b8962eadf05330cf15)
@@ -40,5 +40,7 @@
 #include <mm/asid.h>
 #include <config.h>
+#ifdef MACHINE_msim
 #include <arch/drivers/msim.h>
+#endif
 #include <arch/arch.h>
 #include <print.h>
Index: kernel/arch/mips64/src/mips64.c
===================================================================
--- kernel/arch/mips64/src/mips64.c	(revision 7633928c3dd5a213d06a4fd3739f1ae2e2c661d6)
+++ kernel/arch/mips64/src/mips64.c	(revision 3c50cddc467c69a1aca1a0b8962eadf05330cf15)
@@ -46,5 +46,7 @@
 #include <arch/debug.h>
 #include <arch/debugger.h>
+#ifdef MACHINE_msim
 #include <arch/drivers/msim.h>
+#endif
 #include <genarch/fb/fb.h>
 #include <genarch/drivers/dsrln/dsrlnin.h>
@@ -125,5 +127,5 @@
 	interrupt_init();
 	
-#ifdef CONFIG_MIPS_PRN
+#ifdef CONFIG_MSIM_PRN
 	outdev_t *dsrlndev = dsrlnout_init((ioport8_t *) MSIM_KBD_ADDRESS);
 	if (dsrlndev)
@@ -151,5 +153,5 @@
 	    str_size(platform));
 	
-#ifdef CONFIG_MIPS_KBD
+#ifdef CONFIG_MSIM_KBD
 	/*
 	 * Initialize the msim keyboard port. Then initialize the serial line
Index: kernel/arch/mips64/src/mm/frame.c
===================================================================
--- kernel/arch/mips64/src/mm/frame.c	(revision 7633928c3dd5a213d06a4fd3739f1ae2e2c661d6)
+++ kernel/arch/mips64/src/mm/frame.c	(revision 3c50cddc467c69a1aca1a0b8962eadf05330cf15)
@@ -40,5 +40,7 @@
 #include <mm/asid.h>
 #include <config.h>
+#ifdef MACHINE_msim
 #include <arch/drivers/msim.h>
+#endif
 #include <print.h>