diff options
| -rw-r--r-- | io-module/mts-io.c | 8 |
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" |