From dad201309c9c74a960b526144489348e062b693b Mon Sep 17 00:00:00 2001
From: Jonathan Naylor <naylorjs@yahoo.com>
Date: Thu, 14 Jan 2016 22:19:34 +0000
Subject: [PATCH] Small cleanups.

---
 Conf.h   | 2 +-
 Makefile | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/Conf.h b/Conf.h
index a7eceab..d01cd19 100644
--- a/Conf.h
+++ b/Conf.h
@@ -154,8 +154,8 @@ private:
   bool         m_dmrNetworkDebug;
 
   bool         m_fusionNetworkEnabled;
-  unsigned int m_fusionNetworkPort;
   std::string  m_fusionNetworkAddress;
+  unsigned int m_fusionNetworkPort;
   bool         m_fusionNetworkDebug;
 
   std::string  m_tftSerialPort;
diff --git a/Makefile b/Makefile
index bbeb58d..8badee8 100644
--- a/Makefile
+++ b/Makefile
@@ -27,7 +27,7 @@ CSBK.o:	CSBK.cpp CSBK.h Utils.h DMRDefines.h BPTC19696.h CRC.h Log.h
 Display.o:	Display.cpp Display.h
 		$(CC) $(CFLAGS) -c Display.cpp
 
-DMRControl.o:	DMRControl.cpp DMRControl.h DMRSlot.h DMRData.h Modem.h HomebrewDMRIPSC.h Defines.h CSBK.h Log.h DIsplay.h
+DMRControl.o:	DMRControl.cpp DMRControl.h DMRSlot.h DMRData.h Modem.h HomebrewDMRIPSC.h Defines.h CSBK.h Log.h Display.h
 		$(CC) $(CFLAGS) -c DMRControl.cpp
 
 DMRData.o:	DMRData.cpp DMRData.h DMRDefines.h Utils.h Log.h