3 files changed, 7 insertions, 4 deletions

diff --git a/firmware/export/storage.h b/firmware/export/storage.h
index ee1423c93a..b87b7d001f 100644
--- a/firmware/export/storage.h
+++ b/firmware/export/storage.h
@@ -310,6 +310,9 @@ void storage_get_info(int drive, struct storage_info *info);
 #ifdef HAVE_HOTSWAP
 bool storage_removable(int drive);
 bool storage_present(int drive);
+#else
+#define storage_removable(x) 0
+#define storage_present(x) 1
 #endif
 int storage_driver_type(int drive);
 
diff --git a/firmware/target/hosted/sdl/button-sdl.c b/firmware/target/hosted/sdl/button-sdl.c
index 1055d7e0b9..b5f3720a3b 100644
--- a/firmware/target/hosted/sdl/button-sdl.c
+++ b/firmware/target/hosted/sdl/button-sdl.c
@@ -340,7 +340,7 @@ static void button_event(int key, bool pressed)
         }
         return;
 #endif
-#ifdef HAVE_MULTIDRIVE
+#ifdef HAVE_HOTSWAP
     case EXT_KEY:
         if (!pressed)
             sim_trigger_external(!storage_present(1));
diff --git a/firmware/target/mips/ingenic_jz47xx/ata-nand-jz4760.c b/firmware/target/mips/ingenic_jz47xx/ata-nand-jz4760.c
index 1c9fe4300b..914cd6d9d3 100644
--- a/firmware/target/mips/ingenic_jz47xx/ata-nand-jz4760.c
+++ b/firmware/target/mips/ingenic_jz47xx/ata-nand-jz4760.c
@@ -565,7 +565,7 @@ static inline int write_sector(unsigned long start, unsigned int count,
 
 int nand_read_sectors(IF_MD(int drive,) unsigned long start, int count, void* buf)
 {
-#ifdef HAVE_MULTIVOLUME
+#ifdef HAVE_MULTIDRIVE
     (void)drive;
 #endif
     int ret = 0;
@@ -592,7 +592,7 @@ int nand_read_sectors(IF_MD(int drive,) unsigned long start, int count, void* bu
 
 int nand_write_sectors(IF_MD(int drive,) unsigned long start, int count, const void* buf)
 {
-#ifdef HAVE_MULTIVOLUME
+#ifdef HAVE_MULTIDRIVE
     (void)drive;
 #endif
     int ret = 0;
@@ -664,7 +664,7 @@ void nand_sleepnow(void)
 #ifdef STORAGE_GET_INFO
 void nand_get_info(IF_MD(int drive,) struct storage_info *info)
 {
-#ifdef HAVE_MULTIVOLUME
+#ifdef HAVE_MULTIDRIVE
     (void)drive;
 #endif