2 files changed, 7 insertions, 7 deletions

diff --git a/apps/menus/playback_menu.c b/apps/menus/playback_menu.c
index eb1597948b..5d1421b966 100644
--- a/apps/menus/playback_menu.c
+++ b/apps/menus/playback_menu.c
@@ -67,7 +67,7 @@ MENUITEM_SETTING(ff_rewind_accel, &global_settings.ff_rewind_accel, NULL);
 MENUITEM_SETTING(ff_rewind_min_step, &global_settings.ff_rewind_min_step, NULL);
 MAKE_MENU(ff_rewind_settings_menu, ID2P(LANG_WIND_MENU), 0, Icon_NOICON,
           &ff_rewind_min_step, &ff_rewind_accel);
-#ifndef HAVE_FLASH_STORAGE
+#ifdef HAVE_DISK_STORAGE
 #if CONFIG_CODEC == SWCODEC
 static int buffermargin_callback(int action,const struct menu_item_ex *this_item)
 {
@@ -85,7 +85,7 @@ static int buffermargin_callback(int action,const struct menu_item_ex *this_item
 #endif
 MENUITEM_SETTING(buffer_margin, &global_settings.buffer_margin,
                  buffermargin_callback);
-#endif /*HAVE_FLASH_STORAGE */
+#endif /*HAVE_DISK_STORAGE */
 MENUITEM_SETTING(fade_on_stop, &global_settings.fade_on_stop, NULL);
 MENUITEM_SETTING(party_mode, &global_settings.party_mode, NULL);
 
@@ -181,7 +181,7 @@ MAKE_MENU(playback_settings,ID2P(LANG_PLAYBACK),0,
           Icon_Playback_menu,
           &shuffle_item, &repeat_mode, &play_selected,
           &ff_rewind_settings_menu,
-#ifndef HAVE_FLASH_STORAGE 
+#ifdef HAVE_DISK_STORAGE 
           &buffer_margin,
 #endif
           &fade_on_stop, &party_mode,
diff --git a/apps/menus/settings_menu.c b/apps/menus/settings_menu.c
index d5ddc168a0..48ab316a87 100644
--- a/apps/menus/settings_menu.c
+++ b/apps/menus/settings_menu.c
@@ -173,7 +173,7 @@ MAKE_MENU(battery_menu, ID2P(LANG_BATTERY_MENU), 0, Icon_NOICON,
 #endif
          );
 /* Disk */
-#ifndef HAVE_FLASH_STORAGE
+#ifdef HAVE_DISK_STORAGE
 MENUITEM_SETTING(disk_spindown, &global_settings.disk_spindown, NULL);
 #endif
 #ifdef HAVE_DIRCACHE
@@ -200,9 +200,9 @@ static int dircache_callback(int action,const struct menu_item_ex *this_item)
 }
 MENUITEM_SETTING(dircache, &global_settings.dircache, dircache_callback);
 #endif
-#if defined(HAVE_DIRCACHE) || !defined(HAVE_FLASH_STORAGE)
+#if defined(HAVE_DIRCACHE) || defined(HAVE_DISK_STORAGE)
 MAKE_MENU(disk_menu, ID2P(LANG_DISK_MENU), 0, Icon_NOICON,
-#ifndef HAVE_FLASH_STORAGE
+#ifdef HAVE_DISK_STORAGE
           &disk_spindown,
 #endif
 #ifdef HAVE_DIRCACHE
@@ -374,7 +374,7 @@ MAKE_MENU(system_menu, ID2P(LANG_SYSTEM),
 #if (BATTERY_CAPACITY_INC > 0) || (BATTERY_TYPES_COUNT > 1)
             &battery_menu,
 #endif
-#if defined(HAVE_DIRCACHE) || !defined(HAVE_FLASH_STORAGE)
+#if defined(HAVE_DIRCACHE) || defined(HAVE_DISK_STORAGE)
             &disk_menu,
 #endif
 #if CONFIG_RTC