summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJohn Klug <john.klug@multitech.com>2018-05-02 14:44:32 -0500
committerJohn Klug <john.klug@multitech.com>2018-06-25 11:58:18 -0500
commit8152b0d92e6ab596cdb9764bc51e304381b7646d (patch)
treeaa6104740ae49f10da166eccbc6fbc94a636a60d
parente191c2abe1e652bbed373f25397e0e558401d9b6 (diff)
downloadmts-io-8152b0d92e6ab596cdb9764bc51e304381b7646d.tar.gz
mts-io-8152b0d92e6ab596cdb9764bc51e304381b7646d.tar.bz2
mts-io-8152b0d92e6ab596cdb9764bc51e304381b7646d.zip
Bad git penny: MTR gets the WiFi/GNSS pins from the gpio_pins structure2.0.8
-rw-r--r--io-module/mts-io.c8
1 files changed, 0 insertions, 8 deletions
diff --git a/io-module/mts-io.c b/io-module/mts-io.c
index 0318c97..31f69f9 100644
--- a/io-module/mts-io.c
+++ b/io-module/mts-io.c
@@ -46,15 +46,7 @@
#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"