diff -uNr --ignore-matching-lines='2007-09-03T20:[0-9][0-9]:[0-9][0-9]*' rockbox/firmware/export/config-ipodnano.h rockbox_original/firmware/export/config-ipodnano.h
--- rockbox/firmware/export/config-ipodnano.h	2007-09-03 16:14:31.000000000 -0400
+++ rockbox_original/firmware/export/config-ipodnano.h	2007-09-03 16:16:37.000000000 -0400
@@ -85,8 +85,8 @@
 #define BATTERY_CAPACITY_INC      20  	/* capacity increment */
 #define BATTERY_TYPES_COUNT        1   /* only one type */
 
-/* Hardware controlled charging with monitoring */
-#define CONFIG_CHARGING CHARGING_MONITOR
+/* Hardware controlled charging? FIXME */
+//#define CONFIG_CHARGING CHARGING_SIMPLE
 
 /* define this if the unit can be powered or charged via USB */
 #define HAVE_USB_POWER
diff -uNr --ignore-matching-lines='2007-09-03T20:[0-9][0-9]:[0-9][0-9]*' rockbox/firmware/target/arm/ipod/power-ipod.c rockbox_original/firmware/target/arm/ipod/power-ipod.c
--- rockbox/firmware/target/arm/ipod/power-ipod.c	2007-09-03 16:15:48.000000000 -0400
+++ rockbox_original/firmware/target/arm/ipod/power-ipod.c	2007-09-03 16:16:37.000000000 -0400
@@ -44,9 +44,6 @@
 {
 #ifdef IPOD_VIDEO
     return (GPIOL_INPUT_VAL & 0x08)?false:true;
-#elif defined( IPOD_NANO )
-    return ((GPIOL_INPUT_VAL & 0x10) | (GPIOL_INPUT_VAL &0x08))?false:true; /*5v and 12V pins */
-    //return (GPIOL_INPUT_VAL & 0x08)?false:true;
 #else
     /* This needs filling in for other ipods. */
     return false;