Index: firmware/export/config-ipodnano.h
===================================================================
--- firmware/export/config-ipodnano.h	(revision 22668)
+++ firmware/export/config-ipodnano.h	(working copy)
@@ -120,7 +120,7 @@
 #define BATTERY_TYPES_COUNT        1   /* only one type */
 
 /* Hardware controlled charging? FIXME */
-//#define CONFIG_CHARGING CHARGING_SIMPLE
+#define CONFIG_CHARGING CHARGING_MONITOR
 
 /* define this if the unit can be powered or charged via USB */
 #define HAVE_USB_POWER
@@ -139,9 +139,6 @@
 /* Define this if you want to use the PP5020 i2c interface */
 #define CONFIG_I2C I2C_PP5020
 
-/* define this if the hardware can be powered off while charging */
-//#define HAVE_POWEROFF_WHILE_CHARGING
-
 /* The start address index for ROM builds */
 #define ROM_START 0x00000000