summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJiri Slaby <jirislaby@gmail.com>2008-04-30 00:53:48 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2008-04-30 08:29:43 -0700
commitb9705b603d1d29471aa2977e6310f4f9a4e85925 (patch)
tree434f192a82bf8e4c34d8e319bab900b95f6969e5
parentbb9f910a1153101a2f92620f1e7d0fda786c9812 (diff)
Char: moxa, update credits
- update version - update maintainers - copyright the stuff Signed-off-by: Jiri Slaby <jirislaby@gmail.com> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
-rw-r--r--MAINTAINERS2
-rw-r--r--drivers/char/moxa.c5
2 files changed, 4 insertions, 3 deletions
diff --git a/MAINTAINERS b/MAINTAINERS
index a4b4a6703173..f822c04f1aea 100644
--- a/MAINTAINERS
+++ b/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/drivers/char/moxa.c b/drivers/char/moxa.c
index 72b7e6793169..6757b1922f4f 100644
--- a/drivers/char/moxa.c
+++ b/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