From: Jiri Slaby <jirislaby@gmail.com>

Mxser tty driver name should be ttyMI, not ttyM.  Correct this in mxser_new to
avoid conflicts with isicom driver, which is ttyM.

Acked-by: Alan Cox <alan@lxorguk.ukuu.org.uk>
Signed-off-by: Jiri Slaby <jirislaby@gmail.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
---

 drivers/char/mxser_new.c |    2 +-
 1 files changed, 1 insertion(+), 1 deletion(-)

diff -puN drivers/char/mxser_new.c~mxser_new-correct-tty-driver-name drivers/char/mxser_new.c
--- a/drivers/char/mxser_new.c~mxser_new-correct-tty-driver-name
+++ a/drivers/char/mxser_new.c
@@ -2683,7 +2683,7 @@ static int __init mxser_module_init(void
 
 	/* Initialize the tty_driver structure */
 	mxvar_sdriver->magic = TTY_DRIVER_MAGIC;
-	mxvar_sdriver->name = "ttyM";
+	mxvar_sdriver->name = "ttyMI";
 	mxvar_sdriver->major = ttymajor;
 	mxvar_sdriver->minor_start = 0;
 	mxvar_sdriver->num = MXSER_PORTS + 1;
_