From e191c2abe1e652bbed373f25397e0e558401d9b6 Mon Sep 17 00:00:00 2001
From: John Klug <john.klug@multitech.com>
Date: Fri, 1 Sep 2017 18:04:59 -0500
Subject: Bump the level

---
 io-module/mts-io.c | 8 ++++++++
 1 file changed, 8 insertions(+)

(limited to 'io-module/mts-io.c')

diff --git a/io-module/mts-io.c b/io-module/mts-io.c
index 31f69f9..0318c97 100644
--- a/io-module/mts-io.c
+++ b/io-module/mts-io.c
@@ -46,7 +46,15 @@
 #include <linux/module.h>
 
 #include "mts_io.h"
+<<<<<<< dc450195b63fd13ff74154e5ca06fabec58afd11:io-module/mts-io.c
 #include "buttons.h"
+=======
+
+#define DRIVER_VERSION	"v1.5.15"
+#define DRIVER_AUTHOR	"James Maki <jmaki@multitech.com>"
+#define DRIVER_DESC	"MTS-IO Controller"
+#define DRIVER_NAME	"mts-io"
+>>>>>>> Bump the level:io-module/mts_io.c
 
 #define PLATFORM_NAME	"mts-io"
 
-- 
cgit v1.2.3