From 02d9800ba10312c314eecf57984762d9c7caf1af Mon Sep 17 00:00:00 2001
From: bsongis <bsongis@8db61ce9-5e8f-94c8-fa6b-1d1c8bcca7d0>
Date: Tue, 29 Jan 2013 22:12:00 +0000
Subject: [PATCH] Cosmetics

---
 src/myeeprom.h | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/src/myeeprom.h b/src/myeeprom.h
index b981ebe64..3b8de8b04 100644
--- a/src/myeeprom.h
+++ b/src/myeeprom.h
@@ -106,7 +106,6 @@ enum BeeperMode {
 
 #if defined(CPUARM)
 #define EXTRA_GENERAL_FIELDS \
-  int8_t   speakerVolume; \
   uint8_t  backlightBright; \
   int8_t   currentCalib; \
   int8_t   temperatureWarn; \
@@ -118,8 +117,7 @@ enum BeeperMode {
   uint8_t  optrexDisplay; \
   uint8_t  sticksGain;
 #else
-#define EXTRA_GENERAL_FIELDS \
-  int8_t   speakerVolume
+#define EXTRA_GENERAL_FIELDS
 #endif
 
 enum BacklightMode {
@@ -177,12 +175,13 @@ PACK(typedef struct t_EEGeneral {
   uint8_t   gpsFormat:1;
   uint8_t   unexpectedShutdown:1;
   uint8_t   speakerPitch;
+  int8_t    speakerVolume;
 
   EXTRA_GENERAL_FIELDS;
 
 }) EEGeneral;
 
-#if defined(PCBX9D) || defined(PCBACT)
+#if LCD_W >= 212
 #define LEN_MODEL_NAME     12
 #define LEN_EXPOMIX_NAME   10
 #define LEN_FP_NAME        10