summaryrefslogtreecommitdiffstats
path: root/apps/settings.h
diff options
context:
space:
mode:
authorFrank Gevaerts <frank@gevaerts.be>2012-12-26 18:01:19 +0100
committerFrank Gevaerts <frank@gevaerts.be>2012-12-26 18:01:19 +0100
commit18f0ba003c0f71c086eb83f8c2bb3f67dba881be (patch)
treeaf9abef8b7ed24d264f2c44907b2b12adb7d029c /apps/settings.h
parent64d048be2bf6c3977a29bd03a47b19c2c5cf58cd (diff)
downloadrockbox-18f0ba003c0f71c086eb83f8c2bb3f67dba881be.tar.gz
rockbox-18f0ba003c0f71c086eb83f8c2bb3f67dba881be.tar.bz2
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.h')
-rw-r--r--apps/settings.h2
1 files changed, 1 insertions, 1 deletions
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