Index: apps/debug_menu.c
===================================================================
RCS file: /cvsroot/rockbox/apps/debug_menu.c,v
retrieving revision 1.41
diff -u -r1.41 debug_menu.c
--- apps/debug_menu.c	18 Dec 2002 18:55:49 -0000	1.41
+++ apps/debug_menu.c	8 Feb 2003 23:37:43 -0000
@@ -801,6 +801,7 @@
             case 3: /* remeining time estimation: */
                 lcd_clear_display();
 
+#ifdef HAVE_CHARGE_CTRL
                 snprintf(buf, 30, "charge_state: %d", charge_state);
                 lcd_puts(0, 0, buf);
 
@@ -809,6 +810,7 @@
 
                 snprintf(buf, 30, "Lev.at cycle start: %d%%", powermgmt_last_cycle_level);
                 lcd_puts(0, 2, buf);
+#endif                
 
                 snprintf(buf, 30, "Last PwrHist val: %d.%02d V",
                     power_history[POWER_HISTORY_LEN-1] / 100,
@@ -821,9 +823,9 @@
                 snprintf(buf, 30, "Est. remaining: %d m", battery_time());
                 lcd_puts(0, 6, buf);
 
+#ifdef HAVE_CHARGE_CTRL
                 snprintf(buf, 30, "Trickle sec: %d/60", trickle_sec);
                 lcd_puts(0, 7, buf);
-#ifdef HAVE_CHARGE_CTRL
 #endif                
                 break;
         }
Index: apps/recorder/icons.c
===================================================================
RCS file: /cvsroot/rockbox/apps/recorder/icons.c,v
retrieving revision 1.36
diff -u -r1.36 icons.c
--- apps/recorder/icons.c	18 Dec 2002 22:57:59 -0000	1.36
+++ apps/recorder/icons.c	8 Feb 2003 23:37:44 -0000
@@ -167,7 +167,11 @@
 	if (global_settings.battery_type) {
 #else
     /* show graphical animation when charging instead of numbers */
+#ifdef HAVE_CHARGE_CTRL
 	if ((global_settings.battery_type) && (charge_state != 1)) {
+#else
+	if (global_settings.battery_type) {
+#endif
 #endif
 		/* Numeric display */
 		snprintf(buffer, sizeof(buffer), "%3d", percent);
Index: firmware/config-fmrecorder.h
===================================================================
RCS file: /cvsroot/rockbox/firmware/config-fmrecorder.h,v
retrieving revision 1.5
diff -u -r1.5 config-fmrecorder.h
--- firmware/config-fmrecorder.h	27 Jan 2003 11:23:25 -0000	1.5
+++ firmware/config-fmrecorder.h	8 Feb 2003 23:37:44 -0000
@@ -13,9 +13,6 @@
 /* Define this if you have a MAS3587F */
 #define HAVE_MAS3587F
 
-/* Define this if you have charging control */
-#define HAVE_CHARGE_CTRL
-
 /* Define this if you have ATA power-off control */
 #define HAVE_ATA_POWER_OFF
 
Index: firmware/export/config-fmrecorder.h
===================================================================
RCS file: /cvsroot/rockbox/firmware/export/config-fmrecorder.h,v
retrieving revision 1.1
diff -u -r1.1 config-fmrecorder.h
--- firmware/export/config-fmrecorder.h	7 Feb 2003 09:41:57 -0000	1.1
+++ firmware/export/config-fmrecorder.h	8 Feb 2003 23:37:44 -0000
@@ -13,9 +13,6 @@
 /* Define this if you have a MAS3587F */
 #define HAVE_MAS3587F
 
-/* Define this if you have charging control */
-#define HAVE_CHARGE_CTRL
-
 /* Define this if you have ATA power-off control */
 #define HAVE_ATA_POWER_OFF