--- a/kernel/eka/rombuild/user.iby	Tue Aug 31 16:34:26 2010 +0300
+++ b/kernel/eka/rombuild/user.iby	Wed Sep 01 12:34:56 2010 +0100
@@ -67,12 +67,12 @@
 #endif
 
 
-#if !(defined(INST_X86) || defined(INST_X86GCC)) && !defined(USE_CUSTOM_MMC_PARTITION)
+#ifndef USE_CUSTOM_MMC_PARTITION
 extension[VARID]=\Epoc32\Release\##KMAIN##\##BUILD##\EMMCPTN.DLL                   \Sys\Bin\EMMCPTN.DLL
 #endif
 
-// Stop-mode debug subsystem
-#include "sm_debug.iby"
+// Run-mode debug subsystem
+#include "rm_debug_svr.iby"
 
 // Load Platform Security settings
 #ifndef __DONT_LOAD_PLATSEC_SETTINGS__
@@ -174,10 +174,6 @@
 #endif
 #endif // PAGED_DATA
 
-#if !defined(PAGED_DATA)
-data=##BASEPATH##kernelhwsrv\kernel\eka\rombuild\not_data_paged.txt  Test\not_data_paged.txt unpaged paging_unmovable
-#endif //#if !defined(PAGED_DATA)
-
 // Test constant patching works by setting KHeapMinCellSize to zero, which is the default anyway
 patchdata ekern.exe @ KHeapMinCellSize 0
 patchdata euser.dll @ KHeapMinCellSize 0