Revert r26055 since it breaks certain Archos targets.

git-svn-id: svn://svn.rockbox.org/rockbox/trunk@26067 a1c6a512-1295-4272-9138-f99709370657

2 files changed, 0 insertions, 8 deletions

diff --git a/firmware/drivers/button.c b/firmware/drivers/button.c
index f116ad646e..91b8ebd0c3 100644
--- a/firmware/drivers/button.c
+++ b/firmware/drivers/button.c
@@ -205,12 +205,8 @@ static void button_tick(void)
 #endif
                                     ) &&
 #if CONFIG_CHARGING && !defined(HAVE_POWEROFF_WHILE_CHARGING)
-#if CONFIG_CHARGING >= CHARGING_MONITOR
-                                !charging_state() &&
-#else
                                 !charger_inserted() &&
 #endif
-#endif
                                 repeat_count > POWEROFF_COUNT)
                         {
                             /* Tell the main thread that it's time to
diff --git a/firmware/powermgmt.c b/firmware/powermgmt.c
index bf5734c264..f1dd83ef52 100644
--- a/firmware/powermgmt.c
+++ b/firmware/powermgmt.c
@@ -358,12 +358,8 @@ static void handle_auto_poweroff(void)
 
             if (usb_inserted()
 #if CONFIG_CHARGING && !defined(HAVE_POWEROFF_WHILE_CHARGING)
-#if CONFIG_CHARGING >= CHARGING_MONITOR
-                || charging_state()
-#else
                 || charger_input_state != NO_CHARGER
 #endif
-#endif
             ) {
                 DEBUGF("Sleep timer timeout. Stopping...\n");
                 set_sleep_timer(0);