---

yaml --- r: 95202 b: refs/heads/master c: b9705b6 h: refs/heads/master v: v3
git-mirror · Apr 30, 2008 · ba6e574 · ba6e574
1 parent 809c241
commit ba6e574
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 4 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: bb9f910a1153101a2f92620f1e7d0fda786c9812
+refs/heads/master: b9705b603d1d29471aa2977e6310f4f9a4e85925
diff --git a/trunk/MAINTAINERS b/trunk/MAINTAINERS
@@ -2759,7 +2759,7 @@ M:	rubini@ipvvis.unipv.it
 L:	linux-kernel@vger.kernel.org
 S:	Maintained
 
-MOXA SMARTIO/INDUSTIO SERIAL CARD (MXSER 2.0)
+MOXA SMARTIO/INDUSTIO/INTELLIO SERIAL CARD
 P:	Jiri Slaby
 M:	jirislaby@gmail.com
 L:	linux-kernel@vger.kernel.org

diff --git a/trunk/drivers/char/moxa.c b/trunk/drivers/char/moxa.c
@@ -2,7 +2,8 @@
 /*
  *           moxa.c  -- MOXA Intellio family multiport serial driver.
  *
- *      Copyright (C) 1999-2000  Moxa Technologies (support@moxa.com.tw).
+ *      Copyright (C) 1999-2000  Moxa Technologies (support@moxa.com).
+ *      Copyright (c) 2007 Jiri Slaby <jirislaby@gmail.com>
  *
  *      This code is loosely based on the Linux serial driver, written by
  *      Linus Torvalds, Theodore T'so and others.
@@ -49,7 +50,7 @@
 
 #include "moxa.h"
 
-#define MOXA_VERSION		"5.1k"
+#define MOXA_VERSION		"6.0k"
 
 #define MOXA_FW_HDRLEN		32