From 8b0fbb631b6376ddd55f29335ccb0757befef84c Mon Sep 17 00:00:00 2001
From: Ross Owen <ross@xmos.com>
Date: Thu, 21 May 2015 16:13:08 +0100
Subject: [PATCH] Fixed potential build warning related to MAX_MIX_COUNT redef

---
 module_usb_audio/devicedefines.h | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/module_usb_audio/devicedefines.h b/module_usb_audio/devicedefines.h
index 1a7f0ff1..2f911943 100644
--- a/module_usb_audio/devicedefines.h
+++ b/module_usb_audio/devicedefines.h
@@ -946,10 +946,12 @@
  */
 #ifdef MIXER
     #ifndef MAX_MIX_COUNT
-    	#define MAX_MIX_COUNT        (8)
+    	#define MAX_MIX_COUNT          (8)
     #endif
 #else
-    #define MAX_MIX_COUNT            (0)
+    #ifndef MAX_MIX_COUNT
+        #define MAX_MIX_COUNT          (0)
+    #endif
 #endif
 
 /**
@@ -960,7 +962,7 @@
  * Default: 18
  */
 #ifndef MIX_INPUTS
-    #define MIX_INPUTS                  (18)
+    #define MIX_INPUTS                 (18)
 #endif
 
 /* Volume processing defines */