diff options
| author | Jonathan Gordon <rockbox@jdgordon.info> | 2007-02-18 05:32:06 +0000 |
|---|---|---|
| committer | Jonathan Gordon <rockbox@jdgordon.info> | 2007-02-18 05:32:06 +0000 |
| commit | 9a6f419775270340ee154c55dbe52e99682fb77a (patch) | |
| tree | 188fa4854d2ac5529f701de1bbba29a3241495bc /apps/settings.c | |
| parent | bd47d48c21ddcdd56b3654db78613d93739b8ce7 (diff) | |
| download | rockbox-9a6f419775270340ee154c55dbe52e99682fb77a.tar.gz rockbox-9a6f419775270340ee154c55dbe52e99682fb77a.zip | |
CONFIG_CHARGING
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@12384 a1c6a512-1295-4272-9138-f99709370657
Diffstat (limited to 'apps/settings.c')
| -rw-r--r-- | apps/settings.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/apps/settings.c b/apps/settings.c index 1a1a085ec7..8c51181ea0 100644 --- a/apps/settings.c +++ b/apps/settings.c | |||
| @@ -665,7 +665,7 @@ void sound_settings_apply(void) | |||
| 665 | #endif | 665 | #endif |
| 666 | 666 | ||
| 667 | #ifdef HAVE_USB_POWER | 667 | #ifdef HAVE_USB_POWER |
| 668 | #ifdef CONFIG_CHARGING | 668 | #if CONFIG_CHARGING |
| 669 | usb_charging_enable(global_settings.usb_charging); | 669 | usb_charging_enable(global_settings.usb_charging); |
| 670 | #endif | 670 | #endif |
| 671 | #endif | 671 | #endif |
| @@ -699,7 +699,7 @@ void settings_apply(void) | |||
| 699 | lcd_remote_emireduce(global_settings.remote_reduce_ticking); | 699 | lcd_remote_emireduce(global_settings.remote_reduce_ticking); |
| 700 | #endif | 700 | #endif |
| 701 | remote_backlight_set_timeout(global_settings.remote_backlight_timeout); | 701 | remote_backlight_set_timeout(global_settings.remote_backlight_timeout); |
| 702 | #ifdef CONFIG_CHARGING | 702 | #if CONFIG_CHARGING |
| 703 | remote_backlight_set_timeout_plugged(global_settings.remote_backlight_timeout_plugged); | 703 | remote_backlight_set_timeout_plugged(global_settings.remote_backlight_timeout_plugged); |
| 704 | #endif | 704 | #endif |
| 705 | #ifdef HAS_REMOTE_BUTTON_HOLD | 705 | #ifdef HAS_REMOTE_BUTTON_HOLD |
| @@ -708,7 +708,7 @@ void settings_apply(void) | |||
| 708 | #endif /* HAVE_REMOTE_LCD */ | 708 | #endif /* HAVE_REMOTE_LCD */ |
| 709 | #ifdef CONFIG_BACKLIGHT | 709 | #ifdef CONFIG_BACKLIGHT |
| 710 | backlight_set_timeout(global_settings.backlight_timeout); | 710 | backlight_set_timeout(global_settings.backlight_timeout); |
| 711 | #ifdef CONFIG_CHARGING | 711 | #if CONFIG_CHARGING |
| 712 | backlight_set_timeout_plugged(global_settings.backlight_timeout_plugged); | 712 | backlight_set_timeout_plugged(global_settings.backlight_timeout_plugged); |
| 713 | #endif | 713 | #endif |
| 714 | #if defined(HAVE_BACKLIGHT_PWM_FADING) && !defined(SIMULATOR) | 714 | #if defined(HAVE_BACKLIGHT_PWM_FADING) && !defined(SIMULATOR) |