diff options
-rw-r--r-- | firmware/powermgmt.c | 2 | ||||
-rw-r--r-- | firmware/target/arm/imx31/gigabeat-s/powermgmt-imx31.c | 6 | ||||
-rw-r--r-- | firmware/target/arm/imx31/gigabeat-s/system-target.h | 1 |
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) | |||
1171 | 1171 | ||
1172 | #endif /* SIMULATOR */ | 1172 | #endif /* SIMULATOR */ |
1173 | 1173 | ||
1174 | #ifndef BOOTLOADER | ||
1175 | void sys_poweroff(void) | 1174 | void sys_poweroff(void) |
1176 | { | 1175 | { |
1177 | #ifndef BOOTLOADER | 1176 | #ifndef BOOTLOADER |
@@ -1193,7 +1192,6 @@ void sys_poweroff(void) | |||
1193 | queue_broadcast(SYS_POWEROFF, 0); | 1192 | queue_broadcast(SYS_POWEROFF, 0); |
1194 | #endif /* BOOTLOADER */ | 1193 | #endif /* BOOTLOADER */ |
1195 | } | 1194 | } |
1196 | #endif | ||
1197 | 1195 | ||
1198 | void cancel_shutdown(void) | 1196 | void cancel_shutdown(void) |
1199 | { | 1197 | { |
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) | |||
925 | while (charger_close) | 925 | while (charger_close) |
926 | sleep(HZ/10); | 926 | sleep(HZ/10); |
927 | } | 927 | } |
928 | |||
929 | #ifdef BOOTLOADER | ||
930 | void sys_poweroff(void) | ||
931 | { | ||
932 | } | ||
933 | #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) | |||
39 | } | 39 | } |
40 | #endif | 40 | #endif |
41 | 41 | ||
42 | /* Service the watchdog timer - serviced from the power thread every minute */ | ||
43 | void watchdog_init(unsigned int half_seconds); | 42 | void watchdog_init(unsigned int half_seconds); |
44 | void watchdog_service(void); | 43 | void watchdog_service(void); |
45 | 44 | ||