8 files changed, 13 insertions, 13 deletions

diff --git a/firmware/SOURCES b/firmware/SOURCES
index 11929d8253..36a125783c 100644
--- a/firmware/SOURCES
+++ b/firmware/SOURCES
@@ -115,7 +115,7 @@ target/hosted/sonynwz/nvp-nwz.c
 target/hosted/sonynwz/nwz-db.c
 #endif
 
-#if ((defined(HIBY_LINUX) || defined(FIIO_M3K)) && !defined(SIMULATOR))
+#if ((defined(HIBY_LINUX) || defined(FIIO_M3K_LINUX)) && !defined(SIMULATOR))
 drivers/lcd-memframe.c
 target/hosted/alsa-controls.c
 target/hosted/pcm-alsa.c
@@ -148,7 +148,7 @@ target/hosted/usb-hiby.c
 target/hosted/button-devinput.c
 #endif
 
-#if (defined(FIIO_M3K)) && !defined(SIMULATOR)
+#if (defined(FIIO_M3K_LINUX)) && !defined(SIMULATOR)
 target/hosted/fiio/buttonlight-fiio.c
 target/hosted/fiio/button-fiio.c
 target/hosted/fiio/debug-fiio.c
diff --git a/firmware/asm/SOURCES b/firmware/asm/SOURCES
index 2b18ea2026..ebeaf49193 100644
--- a/firmware/asm/SOURCES
+++ b/firmware/asm/SOURCES
@@ -16,7 +16,7 @@ mempcpy.c
     defined(COWON_D2) || defined(MINI2440) || defined(SAMSUNG_YPR0) || \
     defined(SAMSUNG_YPR1) || defined(DX50) || defined(DX90) || (defined(MROBE_500) && !defined(LCD_USE_DMA)) || \
     defined(CREATIVE_ZEN) || defined(CREATIVE_ZENXFI) || defined(SONY_NWZ_LINUX) || defined(HIBY_LINUX) || \
-    defined(FIIO_M3K)) && \
+    defined(FIIO_M3K_LINUX)) && \
     !defined(SIMULATOR)
 #if LCD_DEPTH >= 24
 lcd-as-memframe-24bit.c
diff --git a/firmware/drivers/audio/fiiolinux_codec.c b/firmware/drivers/audio/fiiolinux_codec.c
index b2d95c91e9..31731fd6ed 100644
--- a/firmware/drivers/audio/fiiolinux_codec.c
+++ b/firmware/drivers/audio/fiiolinux_codec.c
@@ -166,7 +166,7 @@ void audiohw_set_filter_roll_off(int value)
        1 = Slow;
        2 = Short Sharp
        3 = Short Slow */
-#if 0 //  defined(FIIO_M3K)
+#if 0 //  defined(FIIO_M3K_LINUX)
     // AK4376 supports this but the control isn't wired into ALSA!
     long int value_hw = value;
     alsa_controls_set_ints("AK4376 Digital Filter", 1, &value_hw);
diff --git a/firmware/export/config.h b/firmware/export/config.h
index 547c359d8d..e35d407372 100644
--- a/firmware/export/config.h
+++ b/firmware/export/config.h
@@ -163,7 +163,7 @@
 #define IHIFI_800_PAD      68
 #define XDUOO_X3II_PAD     69
 #define XDUOO_X20_PAD      70
-#define FIIO_M3K_PAD       71
+#define FIIO_M3K_LINUX_PAD 71
 #define EROSQ_PAD          72
 
 /* CONFIG_REMOTE_KEYPAD */
@@ -603,8 +603,8 @@ Lyre prototype 1 */
 #include "config/xduoox3ii.h"
 #elif defined(XDUOO_X20)
 #include "config/xduoox20.h"
-#elif defined(FIIO_M3K)
-#include "config/fiiom3k.h"
+#elif defined(FIIO_M3K_LINUX)
+#include "config/fiiom3klinux.h"
 #elif defined(EROS_Q)
 #include "config/aigoerosq.h"
 #else
diff --git a/firmware/export/config/fiiom3k.h b/firmware/export/config/fiiom3klinux.h
index 6e831f2f55..51d2a222e6 100644
--- a/firmware/export/config/fiiom3k.h
+++ b/firmware/export/config/fiiom3klinux.h
@@ -1,5 +1,5 @@
 /*
- * This config file is for the FiiO M3K
+ * This config file is for the FiiO M3K (Linux version)
  */
 
 /* For Rolo and boot loader */
@@ -74,7 +74,7 @@
 #define HAVE_HEADPHONE_DETECTION
 
 /* KeyPad configuration for plugins */
-#define CONFIG_KEYPAD FIIO_M3K_PAD
+#define CONFIG_KEYPAD FIIO_M3K_LINUX_PAD
 
 /* Define this if a programmable hotkey is mapped */
 #define HAVE_HOTKEY
diff --git a/firmware/export/rbpaths.h b/firmware/export/rbpaths.h
index da5a2fb71c..f53d0eb480 100644
--- a/firmware/export/rbpaths.h
+++ b/firmware/export/rbpaths.h
@@ -43,7 +43,7 @@
 /* NOTE:  target-specific hosted HOME_DIR resides in filesystem-app.c */
 #if !defined(APPLICATION) || defined(SAMSUNG_YPR0) || defined(SAMSUNG_YPR1) || \
     defined(DX50) || defined(DX90) || defined(SONY_NWZ_LINUX) || \
-    defined(HIBY_LINUX) || defined(FIIO_M3K)
+    defined(HIBY_LINUX) || defined(FIIO_M3K_LINUX)
 
 #define HOME_DIR "/"
 
@@ -80,7 +80,7 @@
 
 #if defined(APPLICATION) && \
         !(defined(SAMSUNG_YPR0) || defined(SAMSUNG_YPR1) || \
-          defined(DX50) || defined(DX90) || defined(SONY_NWZ_LINUX) || defined(HIBY_LINUX) || defined(FIIO_M3K))
+          defined(DX50) || defined(DX90) || defined(SONY_NWZ_LINUX) || defined(HIBY_LINUX) || defined(FIIO_M3K_LINUX))
 
 #define PLUGIN_DATA_DIR          ROCKBOX_DIR "/rocks.data"
 #define PLUGIN_GAMES_DATA_DIR    PLUGIN_DATA_DIR
diff --git a/firmware/export/system.h b/firmware/export/system.h
index 68d7958870..f9a074349b 100644
--- a/firmware/export/system.h
+++ b/firmware/export/system.h
@@ -347,7 +347,7 @@ static inline void cpu_boost_unlock(void)
 #ifndef SIMULATOR
 bool dbg_ports(void);
 #endif
-#if (CONFIG_PLATFORM & PLATFORM_NATIVE) || defined(SONY_NWZ_LINUX) || defined(HIBY_LINUX) || defined(FIIO_M3K)
+#if (CONFIG_PLATFORM & PLATFORM_NATIVE) || defined(SONY_NWZ_LINUX) || defined(HIBY_LINUX) || defined(FIIO_M3K_LINUX)
 bool dbg_hw_info(void);
 #endif
 
diff --git a/firmware/font.c b/firmware/font.c
index b2ac1a3c3c..595410fed2 100644
--- a/firmware/font.c
+++ b/firmware/font.c
@@ -85,7 +85,7 @@
 /* compiled-in font */
 extern struct font sysfont;
 
-#if !defined(BOOTLOADER) || defined(SONY_NWZ_LINUX) || defined(HIBY_LINUX) || defined(FIIO_M3K)
+#if !defined(BOOTLOADER) || defined(SONY_NWZ_LINUX) || defined(HIBY_LINUX) || defined(FIIO_M3K_LINUX)
 
 struct buflib_alloc_data {
     struct font font;    /* must be the first member! */