summaryrefslogtreecommitdiff
path: root/firmware/drivers/button.c
diff options
context:
space:
mode:
authorMichael Sevakis <jethead71@rockbox.org>2010-05-15 21:27:22 +0000
committerMichael Sevakis <jethead71@rockbox.org>2010-05-15 21:27:22 +0000
commit964dcb33b6b55347ee6ad4020bd00843fbcd2a1d (patch)
tree337ecee78c71e4b08b251508acd4135d3fc70601 /firmware/drivers/button.c
parentb6c3bc1cc90a05d462abc674ee7fc2f9567be453 (diff)
downloadrockbox-964dcb33b6b55347ee6ad4020bd00843fbcd2a1d.zip
rockbox-964dcb33b6b55347ee6ad4020bd00843fbcd2a1d.tar.gz
rockbox-964dcb33b6b55347ee6ad4020bd00843fbcd2a1d.tar.bz2
rockbox-964dcb33b6b55347ee6ad4020bd00843fbcd2a1d.tar.xz
Revert r26055 since it breaks certain Archos targets.
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@26067 a1c6a512-1295-4272-9138-f99709370657
Diffstat (limited to 'firmware/drivers/button.c')
-rw-r--r--firmware/drivers/button.c4
1 files changed, 0 insertions, 4 deletions
diff --git a/firmware/drivers/button.c b/firmware/drivers/button.c
index f116ad6..91b8ebd 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