diff --git a/firmware/drivers/serial.c b/firmware/drivers/serial.c
index 6ee5b4f81b..728bc6f45f 100644
--- a/firmware/drivers/serial.c
+++ b/firmware/drivers/serial.c
@@ -27,7 +27,9 @@
 #include "lcd.h"
 #include "serial.h"
 
-#if CONFIG_CPU != MCF5249 /* FIX: this is not compiled for coldfire */
+#if (CONFIG_CPU != MCF5249) && (CONFIG_CPU != TCC730)
+/* FIX: this doesn't work on iRiver or Gmini yet */
+
 #ifndef HAVE_MMC /* MMC takes serial port 1, so don't mess with it */
 
 /* Received byte identifiers */
@@ -138,9 +140,9 @@ int remote_control_rx(void)
 }
 
 #endif /* HAVE_MMC */
-#else
+#else /*  (CONFIG_CPU != MCF5249) && (CONFIG_CPU != TCC730) */
 void serial_setup (void) 
 {
     /* a dummy */
 }
-#endif /* CONFIG_CPU != MCF5249 */
+#endif /* ! (CONFIG_CPU != MCF5249) && (CONFIG_CPU != TCC730) */
diff --git a/firmware/rolo.c b/firmware/rolo.c
index a5b3c56da9..fccc9f38da 100644
--- a/firmware/rolo.c
+++ b/firmware/rolo.c
@@ -29,7 +29,8 @@
 #include "string.h"
 #include "buffer.h"
 
-#if CONFIG_CPU != MCF5249 /* FIX: this doesn't work on iRiver yet */
+#if (CONFIG_CPU != MCF5249) && (CONFIG_CPU != TCC730)
+/* FIX: this doesn't work on iRiver or Gmini yet */
 
 #define IRQ0_EDGE_TRIGGER 0x80
 
@@ -145,7 +146,7 @@ int rolo_load(const char* filename)
 
     return 0; /* this is never reached */
 }
-#else  /* CONFIG_CPU != MCF5249 */
+#else  /* (CONFIG_CPU != MCF5249) && (CONFIG_CPU != TCC730) */
 int rolo_load(const char* filename)
 {
     /* dummy */
@@ -153,4 +154,4 @@ int rolo_load(const char* filename)
     return 0;
 }
 
-#endif /* CONFIG_CPU == MCF5249 */
+#endif /* ! (CONFIG_CPU != MCF5249) && (CONFIG_CPU != TCC730) */