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/menus/settings_menu.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/menus/settings_menu.c')
-rw-r--r-- | apps/menus/settings_menu.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/apps/menus/settings_menu.c b/apps/menus/settings_menu.c index 23807e2adc..95423a20fa 100644 --- a/apps/menus/settings_menu.c +++ b/apps/menus/settings_menu.c | |||
@@ -173,7 +173,7 @@ MENUITEM_SETTING(battery_capacity, &global_settings.battery_capacity, NULL); | |||
173 | #if BATTERY_TYPES_COUNT > 1 | 173 | #if BATTERY_TYPES_COUNT > 1 |
174 | MENUITEM_SETTING(battery_type, &global_settings.battery_type, NULL); | 174 | MENUITEM_SETTING(battery_type, &global_settings.battery_type, NULL); |
175 | #endif | 175 | #endif |
176 | #if defined (HAVE_USBSTACK) && defined(HAVE_USB_CHARGING_ENABLE) | 176 | #ifdef HAVE_USB_CHARGING_ENABLE |
177 | static int usbcharging_callback(int action,const struct menu_item_ex *this_item) | 177 | static int usbcharging_callback(int action,const struct menu_item_ex *this_item) |
178 | { | 178 | { |
179 | (void)this_item; | 179 | (void)this_item; |
@@ -194,7 +194,7 @@ MAKE_MENU(battery_menu, ID2P(LANG_BATTERY_MENU), 0, Icon_NOICON, | |||
194 | #if BATTERY_TYPES_COUNT > 1 | 194 | #if BATTERY_TYPES_COUNT > 1 |
195 | &battery_type, | 195 | &battery_type, |
196 | #endif | 196 | #endif |
197 | #if defined (HAVE_USBSTACK) && defined(HAVE_USB_CHARGING_ENABLE) | 197 | #ifdef HAVE_USB_CHARGING_ENABLE |
198 | &usb_charging, | 198 | &usb_charging, |
199 | #endif | 199 | #endif |
200 | ); | 200 | ); |