Index: apps/tree.c
===================================================================
--- apps/tree.c (revision 13673)
+++ apps/tree.c (working copy)
@@ -168,8 +168,6 @@
 #ifdef HAVE_LCD_COLOR
 static int tree_get_filecolor(int selected_item, void * data)
 {
-    if (*tc.dirfilter == SHOW_ID3DB)
-        return -1;
     struct tree_context * local_tc=(struct tree_context *)data;
     struct entry* dc = local_tc->dircache;
     struct entry* e = &dc[selected_item];
Index: firmware/target/coldfire/iriver/h100/sw_i2c-h100.c
===================================================================
--- firmware/target/coldfire/iriver/h100/sw_i2c-h100.c  (revision 13673)
+++ firmware/target/coldfire/iriver/h100/sw_i2c-h100.c  (working copy)
@@ -42,7 +42,7 @@
 #define SDA_HI     and_l(~0x00002000, &GPIO1_ENABLE)

 /* delay loop to achieve 400kHz at 120MHz CPU frequency */
-#define DELAY    do { int _x; for(_x=0;_x<22;_x++);} while(0)
+#define DELAY    do { volatile int _x; for(_x=0;_x<22;_x++);} while(0)

 void sw_i2c_init(void)
 {