From 18f0ba003c0f71c086eb83f8c2bb3f67dba881be Mon Sep 17 00:00:00 2001
From: Frank Gevaerts <frank@gevaerts.be>
Date: Wed, 26 Dec 2012 18:01:19 +0100
Subject: 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
---
 apps/menus/settings_menu.c | 4 ++--
 apps/settings.c            | 2 +-
 apps/settings.h            | 2 +-
 apps/settings_list.c       | 2 +-
 4 files changed, 5 insertions(+), 5 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);
 #if BATTERY_TYPES_COUNT > 1
 MENUITEM_SETTING(battery_type, &global_settings.battery_type, NULL);
 #endif
-#if defined (HAVE_USBSTACK) && defined(HAVE_USB_CHARGING_ENABLE)
+#ifdef HAVE_USB_CHARGING_ENABLE
 static int usbcharging_callback(int action,const struct menu_item_ex *this_item)
 {
     (void)this_item;
@@ -194,7 +194,7 @@ MAKE_MENU(battery_menu, ID2P(LANG_BATTERY_MENU), 0, Icon_NOICON,
 #if BATTERY_TYPES_COUNT > 1
             &battery_type,
 #endif
-#if defined (HAVE_USBSTACK) && defined(HAVE_USB_CHARGING_ENABLE)
+#ifdef HAVE_USB_CHARGING_ENABLE
             &usb_charging,
 #endif
          );
diff --git a/apps/settings.c b/apps/settings.c
index a0f219efec..e2a6efa3d8 100644
--- a/apps/settings.c
+++ b/apps/settings.c
@@ -1020,7 +1020,7 @@ void settings_apply(bool read_disk)
     touchpad_set_sensitivity(global_settings.touchpad_sensitivity);
 #endif
 
-#if defined (HAVE_USBSTACK) && defined(HAVE_USB_CHARGING_ENABLE)
+#ifdef HAVE_USB_CHARGING_ENABLE
     usb_charging_enable(global_settings.usb_charging);
 #endif
 
diff --git a/apps/settings.h b/apps/settings.h
index 94967c3c4c..2af29ce423 100644
--- a/apps/settings.h
+++ b/apps/settings.h
@@ -619,7 +619,7 @@ struct user_settings
 #ifdef HAVE_SPDIF_POWER
     bool spdif_enable; /* S/PDIF power on/off */
 #endif
-#if defined (HAVE_USBSTACK) && defined(HAVE_USB_CHARGING_ENABLE)
+#ifdef HAVE_USB_CHARGING_ENABLE
     int usb_charging;
 #endif
 
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[] = {
 #ifdef HAVE_LCD_BITMAP
     TEXT_SETTING(0,kbd_file,"kbd","-",ROCKBOX_DIR "/",".kbd"),
 #endif
-#if defined (HAVE_USBSTACK) && defined(HAVE_USB_CHARGING_ENABLE)
+#ifdef HAVE_USB_CHARGING_ENABLE
     CHOICE_SETTING(0, usb_charging, LANG_USB_CHARGING, 1, "usb charging",
                    "off,on,force", NULL, 3, ID2P(LANG_SET_BOOL_NO),
                    ID2P(LANG_SET_BOOL_YES), ID2P(LANG_FORCE)),
-- 
cgit v1.2.3