--- a/gsm-fw/g23m-gsm/mm/Makefile	Fri Oct 03 21:10:00 2014 +0000
+++ b/gsm-fw/g23m-gsm/mm/Makefile	Sat Oct 04 00:45:59 2014 +0000
@@ -1,5 +1,13 @@
-# stub Makefile, to be filled out
-all:
+CC=	arm-elf-gcc
+LD=	arm-elf-ld
+
+CFLAGS=	-O2 -fno-builtin -mthumb-interwork -mthumb
+CPPFLAGS=-I. -I../../include -I../../include/condat -I../../gpf/inc \
+	-I../../cdginc
+
+OBJS=	mm_csf.o
+
+all:	${OBJS}
 
 clean:
 	rm -f *.[oa] *.out *errs

--- a/gsm-fw/g23m-gsm/mm/mm.h	Fri Oct 03 21:10:00 2014 +0000
+++ b/gsm-fw/g23m-gsm/mm/mm.h	Sat Oct 04 00:45:59 2014 +0000
@@ -408,8 +408,8 @@
 
 /* N950 Memory Optimization - Implements Measure #39*/
 EXTERN  T_S2I_STRING const STATE_MM_NAME[];
+
 #ifdef GPRS
-
 /* 
  * States of CM establishment if GPRS is present
  */
@@ -680,7 +680,8 @@
    */
   BOOL                  sim_read_in_progress;
   
-  /* This variable will be used to decide if SIM_SYNC_REQ should be sent or not. 
+  /*
+   * This variable will be used to decide if SIM_SYNC_REQ should be sent or not.
    * After receiving SIM_MM_INSERT_IND, MM should respond with a SIM_SYNC_REQ.
    * This SIM_SYNC_REQ will be sent after reading either EFPLMNSel or EFPLMNwAct
    * and EFOPLMNwAct
@@ -690,8 +691,6 @@
   /*SET true is sim file update indication is received*/
   BOOL                  sim_file_upd_ind_rec;
 
-
-
   /* HPLMN search period, this is forwarded to RR and not evaluated by MM */
   UBYTE                 thplmn;
   
@@ -772,8 +771,7 @@
   /* This flag enables a quick search when coming back from VPLMN to HPLMN and RR_ABORT_IND gives 
      HPLMN as a part of its List*/
   BOOL                  quick_hplmn_search;
-  
-  
+
 } T_REG;
 
 /*
@@ -1033,7 +1031,7 @@
   BOOL                  config_use_stored_bcch;
 
   
- /* This variable is used to prevent an RR_ABORT_IND caused by a RR TABORT timer 
+ /* This variable is used to prevent an RR_ABORT_IND caused by a RR TABORT timer
   * timeout from interfering with FTA test 26.7.4.3.4 
   */
   BOOL rr_abort_prior_to_tabort;

--- a/gsm-fw/g23m-gsm/mm/mm_csf.c	Fri Oct 03 21:10:00 2014 +0000
+++ b/gsm-fw/g23m-gsm/mm/mm_csf.c	Sat Oct 04 00:45:59 2014 +0000
@@ -22,6 +22,10 @@
 #ifndef MM_CSF_C
 #define MM_CSF_C
 
+#include "config.h"
+#include "fixedconf.h"
+#include "condat-features.h"
+
 #define ENTITY_MM
 
 /*==== INCLUDES ===================================================*/
@@ -247,4 +251,3 @@
 /* N950 Memory Optimization - Implements Measure #39*/
 /* Removed unused Function*/
 #endif
-