Fix red. Remove stale comment.

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

3 files changed, 0 insertions, 9 deletions

diff --git a/firmware/powermgmt.c b/firmware/powermgmt.c
index 00b7b2fd4f..0fed847973 100644
--- a/firmware/powermgmt.c
+++ b/firmware/powermgmt.c
@@ -1171,7 +1171,6 @@ void powermgmt_init(void)
 
 #endif /* SIMULATOR */
 
-#ifndef BOOTLOADER
 void sys_poweroff(void)
 {
 #ifndef BOOTLOADER
@@ -1193,7 +1192,6 @@ void sys_poweroff(void)
     queue_broadcast(SYS_POWEROFF, 0);
 #endif /* BOOTLOADER */
 }
-#endif
 
 void cancel_shutdown(void)
 {
diff --git a/firmware/target/arm/imx31/gigabeat-s/powermgmt-imx31.c b/firmware/target/arm/imx31/gigabeat-s/powermgmt-imx31.c
index c44e7ccdda..fa9c7b045f 100644
--- a/firmware/target/arm/imx31/gigabeat-s/powermgmt-imx31.c
+++ b/firmware/target/arm/imx31/gigabeat-s/powermgmt-imx31.c
@@ -925,9 +925,3 @@ void charging_algorithm_close(void)
     while (charger_close)
         sleep(HZ/10);
 }
-
-#ifdef BOOTLOADER
-void sys_poweroff(void)
-{
-}
-#endif /* BOOTLOADER */
diff --git a/firmware/target/arm/imx31/gigabeat-s/system-target.h b/firmware/target/arm/imx31/gigabeat-s/system-target.h
index fbf7b23f3b..847e6cfc51 100644
--- a/firmware/target/arm/imx31/gigabeat-s/system-target.h
+++ b/firmware/target/arm/imx31/gigabeat-s/system-target.h
@@ -39,7 +39,6 @@ static inline void udelay(unsigned int usecs)
 }
 #endif
 
-/* Service the watchdog timer - serviced from the power thread every minute */
 void watchdog_init(unsigned int half_seconds);
 void watchdog_service(void);