--- a/nuc-fw/serial/init.c	Thu Oct 31 23:08:59 2013 +0000
+++ b/nuc-fw/serial/init.c	Fri Nov 01 01:31:39 2013 +0000
@@ -21,20 +21,27 @@
 
 const T_AppliSerialInfo appli_ser_cfg_info = {
 	/*
-	 * Default configuration: for now we always set it
-	 * to the "standard" 0x0168; later we may add
-	 * compile-time conditionals based on FreeCalypso
-	 * configuration magic.
+	 * Default configuration: set it to the "standard"
+	 * 0x0168, unless the RVTMUX serial channel has been
+	 * moved to the MODEM UART.
 	 */
+	#if CONFIG_RVTMUX_ON_MODEM
+              {DUMMY_BT_HCI,
+               DUMMY_FAX_DATA,
+               UART_MODEM_TRACE,
+               DUMMY_TRACE},       // 0x0248
+	#else
               {DUMMY_BT_HCI,
                UART_MODEM_FAX_DATA,
                UART_IRDA_TRACE,
-              DUMMY_TRACE},    // default config = 0x0168
-  #ifdef BTEMOBILE
+               DUMMY_TRACE},    // default config = 0x0168
+	#endif
+	/* number of possible configs */
+	#ifdef BTEMOBILE
              12,	// 12 serial config allowed
-  #else // BTEMOBILE
+	#else // BTEMOBILE
              9,	// 9 serial config allowed
-  #endif
+	#endif
              {
               // Configs with Condat Panel only
               {DUMMY_BT_HCI,
@@ -73,7 +80,7 @@
                UART_MODEM_FAX_DATA,
                DUMMY_TRACE,
                UART_IRDA_TRACE},   // 0x1068
-  #ifdef BTEMOBILE
+	#ifdef BTEMOBILE
               // Configs with L1/Riviera Trace and Bluetooth HCI
               {UART_IRDA_BT_HCI,
                DUMMY_FAX_DATA,
@@ -88,7 +95,7 @@
                UART_MODEM_FAX_DATA,
                DUMMY_TRACE,
                DUMMY_TRACE},       // 0x0069
-  #endif // BTEMOBILE
+	#endif // BTEMOBILE
               // Configs with L1/Riviera Trace and AT-Cmd
               {DUMMY_BT_HCI,
                UART_MODEM_FAX_DATA,