diff options
| author | Thomas Jarosch <tomj@simonv.com> | 2011-03-01 21:06:46 +0000 |
|---|---|---|
| committer | Thomas Jarosch <tomj@simonv.com> | 2011-03-01 21:06:46 +0000 |
| commit | ef99e33bc57d9f0d70507eb3e1b491cd0597320d (patch) | |
| tree | 132d3a11311613aa42b76fe8f6e5f5f4a6dc8b32 /firmware | |
| parent | acd8bffb9576432cb52c6c325da74192a30bae67 (diff) | |
| download | rockbox-ef99e33bc57d9f0d70507eb3e1b491cd0597320d.tar.gz rockbox-ef99e33bc57d9f0d70507eb3e1b491cd0597320d.zip | |
Fix red
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@29486 a1c6a512-1295-4272-9138-f99709370657
Diffstat (limited to 'firmware')
| -rw-r--r-- | firmware/powermgmt.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/firmware/powermgmt.c b/firmware/powermgmt.c index c856e1be70..db37a5df0b 100644 --- a/firmware/powermgmt.c +++ b/firmware/powermgmt.c | |||
| @@ -788,11 +788,13 @@ void cancel_shutdown(void) | |||
| 788 | { | 788 | { |
| 789 | logf("cancel_shutdown()"); | 789 | logf("cancel_shutdown()"); |
| 790 | 790 | ||
| 791 | #ifndef BOOTLOADER | ||
| 791 | #if defined(IAUDIO_X5) || defined(IAUDIO_M5) || defined(COWON_D2) | 792 | #if defined(IAUDIO_X5) || defined(IAUDIO_M5) || defined(COWON_D2) |
| 792 | /* TODO: Move some things to target/ tree */ | 793 | /* TODO: Move some things to target/ tree */ |
| 793 | if (shutdown_timeout) | 794 | if (shutdown_timeout) |
| 794 | pcf50606_reset_timeout(); | 795 | pcf50606_reset_timeout(); |
| 795 | #endif | 796 | #endif |
| 797 | #endif /* BOOTLOADER */ | ||
| 796 | 798 | ||
| 797 | shutdown_timeout = 0; | 799 | shutdown_timeout = 0; |
| 798 | } | 800 | } |