diff options
| author | Frank Gevaerts <frank@gevaerts.be> | 2012-12-26 18:01:19 +0100 |
|---|---|---|
| committer | Frank Gevaerts <frank@gevaerts.be> | 2012-12-26 18:01:19 +0100 |
| commit | 18f0ba003c0f71c086eb83f8c2bb3f67dba881be (patch) | |
| tree | af9abef8b7ed24d264f2c44907b2b12adb7d029c /apps/settings_list.c | |
| parent | 64d048be2bf6c3977a29bd03a47b19c2c5cf58cd (diff) | |
| download | rockbox-18f0ba003c0f71c086eb83f8c2bb3f67dba881be.tar.gz rockbox-18f0ba003c0f71c086eb83f8c2bb3f67dba881be.zip | |
Revert 64d048be. It breaks h300.
HAVE_USB_CHARGING_ENABLE is not only used for software usb, so checking
for HAVE_USBSTACK is wrong.
Change-Id: I422796b517c262f33f35623e992434219e288424
Diffstat (limited to 'apps/settings_list.c')
| -rw-r--r-- | apps/settings_list.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/apps/settings_list.c b/apps/settings_list.c index 9b1fea4b04..f27c13c4f1 100644 --- a/apps/settings_list.c +++ b/apps/settings_list.c | |||
| @@ -1690,7 +1690,7 @@ const struct settings_list settings[] = { | |||
| 1690 | #ifdef HAVE_LCD_BITMAP | 1690 | #ifdef HAVE_LCD_BITMAP |
| 1691 | TEXT_SETTING(0,kbd_file,"kbd","-",ROCKBOX_DIR "/",".kbd"), | 1691 | TEXT_SETTING(0,kbd_file,"kbd","-",ROCKBOX_DIR "/",".kbd"), |
| 1692 | #endif | 1692 | #endif |
| 1693 | #if defined (HAVE_USBSTACK) && defined(HAVE_USB_CHARGING_ENABLE) | 1693 | #ifdef HAVE_USB_CHARGING_ENABLE |
| 1694 | CHOICE_SETTING(0, usb_charging, LANG_USB_CHARGING, 1, "usb charging", | 1694 | CHOICE_SETTING(0, usb_charging, LANG_USB_CHARGING, 1, "usb charging", |
| 1695 | "off,on,force", NULL, 3, ID2P(LANG_SET_BOOL_NO), | 1695 | "off,on,force", NULL, 3, ID2P(LANG_SET_BOOL_NO), |
| 1696 | ID2P(LANG_SET_BOOL_YES), ID2P(LANG_FORCE)), | 1696 | ID2P(LANG_SET_BOOL_YES), ID2P(LANG_FORCE)), |