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.tar.gz
rockbox-964dcb33b6b55347ee6ad4020bd00843fbcd2a1d.zip
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 f116ad646e..91b8ebd0c3 100644
--- a/firmware/drivers/button.c
+++ b/firmware/drivers/button.c
@@ -205,12 +205,8 @@ static void button_tick(void)
205#endif 205#endif
206 ) && 206 ) &&
207#if CONFIG_CHARGING && !defined(HAVE_POWEROFF_WHILE_CHARGING) 207#if CONFIG_CHARGING && !defined(HAVE_POWEROFF_WHILE_CHARGING)
208#if CONFIG_CHARGING >= CHARGING_MONITOR
209 !charging_state() &&
210#else
211 !charger_inserted() && 208 !charger_inserted() &&
212#endif 209#endif
213#endif
214 repeat_count > POWEROFF_COUNT) 210 repeat_count > POWEROFF_COUNT)
215 { 211 {
216 /* Tell the main thread that it's time to 212 /* Tell the main thread that it's time to