summaryrefslogtreecommitdiffstats
path: root/apps
diff options
context:
space:
mode:
authorSolomon Peachy <pizza@shaftnet.org>2021-03-07 18:11:13 -0500
committerSolomon Peachy <pizza@shaftnet.org>2021-03-07 23:12:41 +0000
commitbbd85cf0c1b3fb14d46216ed7a5bc79a70375567 (patch)
treef1dc71188f210eb3c4a7a90ae88a08cd53cf335c /apps
parent9712d375ce31d8394cc30b9121577a7646c1af12 (diff)
downloadrockbox-bbd85cf0c1b3fb14d46216ed7a5bc79a70375567.tar.gz
rockbox-bbd85cf0c1b3fb14d46216ed7a5bc79a70375567.tar.bz2
rockbox-bbd85cf0c1b3fb14d46216ed7a5bc79a70375567.zip
settings: Fix inconsistent #ifdefs wrapping the usb_mode stuff
It should be: #if defined(HAVE_USB_POWER) && !defined(USB_NONE) && !defined(SIMULATOR) Change-Id: I49355d56834de3893a9a244793b39f662c27f136
Diffstat (limited to 'apps')
-rw-r--r--apps/menus/settings_menu.c2
-rw-r--r--apps/settings.h2
2 files changed, 2 insertions, 2 deletions
diff --git a/apps/menus/settings_menu.c b/apps/menus/settings_menu.c
index f8dbb86dc3..a28b568da1 100644
--- a/apps/menus/settings_menu.c
+++ b/apps/menus/settings_menu.c
@@ -449,7 +449,7 @@ MAKE_MENU(system_menu, ID2P(LANG_SYSTEM),
#if defined(DX50) || defined(DX90)
&governor,
#endif
-#ifdef HAVE_USB_POWER
+#if defined(HAVE_USB_POWER) && !defined(USB_NONE) && !defined(SIMULATOR)
&usb_mode,
#endif
);
diff --git a/apps/settings.h b/apps/settings.h
index e6af373e15..728e10bf30 100644
--- a/apps/settings.h
+++ b/apps/settings.h
@@ -824,7 +824,7 @@ struct user_settings
#if defined(DX50) || defined(DX90)
int governor;
#endif
-#ifdef HAVE_USB_POWER
+#if defined(HAVE_USB_POWER) && !defined(USB_NONE) && !defined(SIMULATOR)
int usb_mode;
#endif
};