From a89bf68e889dd989e486b0a131618f69e5fc26c6 Mon Sep 17 00:00:00 2001 From: Solomon Peachy Date: Mon, 29 Jul 2019 22:16:06 -0400 Subject: cleanup: Remove HAVE_MULTIVOLUME from targets with HAVE_MULTIDRIVE The latter always enables the former. There are no remaining HAVE_MULTIVOLUME users in-tree. Change-Id: I0f4fd03a6ffed5c0eb3fb5f916f671bd199f1c8e --- firmware/export/config/creativezen.h | 1 - firmware/export/config/creativezenxfi.h | 1 - firmware/export/config/creativezenxfi2.h | 1 - firmware/export/config/creativezenxfi3.h | 1 - 4 files changed, 4 deletions(-) diff --git a/firmware/export/config/creativezen.h b/firmware/export/config/creativezen.h index 0033b7d4eb..81f594f76f 100644 --- a/firmware/export/config/creativezen.h +++ b/firmware/export/config/creativezen.h @@ -133,7 +133,6 @@ #define CONFIG_STORAGE STORAGE_SD #define NUM_DRIVES 2 #define HAVE_MULTIDRIVE -#define HAVE_MULTIVOLUME #define HAVE_HOTSWAP /* todo */ diff --git a/firmware/export/config/creativezenxfi.h b/firmware/export/config/creativezenxfi.h index 35bd1efdfb..fbe114d5c7 100644 --- a/firmware/export/config/creativezenxfi.h +++ b/firmware/export/config/creativezenxfi.h @@ -138,7 +138,6 @@ #define CONFIG_STORAGE STORAGE_SD #define NUM_DRIVES 2 #define HAVE_MULTIDRIVE -#define HAVE_MULTIVOLUME #define HAVE_HOTSWAP /* todo */ diff --git a/firmware/export/config/creativezenxfi2.h b/firmware/export/config/creativezenxfi2.h index 3945311e29..9fff106e26 100644 --- a/firmware/export/config/creativezenxfi2.h +++ b/firmware/export/config/creativezenxfi2.h @@ -140,7 +140,6 @@ #define CONFIG_STORAGE (/*STORAGE_NAND |*/ STORAGE_SD) #define NUM_DRIVES 2 #define HAVE_MULTIDRIVE -#define HAVE_MULTIVOLUME #define HAVE_HOTSWAP_STORAGE_AS_MAIN #define HAVE_HOTSWAP #define CONFIG_NAND NAND_IMX233 diff --git a/firmware/export/config/creativezenxfi3.h b/firmware/export/config/creativezenxfi3.h index d72b41d608..81e1e453b2 100644 --- a/firmware/export/config/creativezenxfi3.h +++ b/firmware/export/config/creativezenxfi3.h @@ -144,7 +144,6 @@ #define CONFIG_STORAGE STORAGE_SD #define NUM_DRIVES 2 #define HAVE_MULTIDRIVE -#define HAVE_MULTIVOLUME #define HAVE_HOTSWAP /* Extra threads: touchpad */ -- cgit v1.2.3