aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJiri Slaby <jirislaby@gmail.com>2006-12-08 05:38:09 -0500
committerLinus Torvalds <torvalds@woody.osdl.org>2006-12-08 11:28:52 -0500
commitae25f8ecdf65cd3e79e077dc0dba46416134d00c (patch)
treee7a31e35883ae2081e27299d5878a9b3dead7c4f
parent10731b88a2725e0f1b21394433c8e53fde6a3634 (diff)
[PATCH] mxser: correct tty driver name
Mxser tty driver name should be ttyMI, not ttyM. Correct this in mxser 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> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
-rw-r--r--drivers/char/mxser.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/char/mxser.c b/drivers/char/mxser.c
index b1cc89c89820..4204746f1590 100644
--- a/drivers/char/mxser.c
+++ b/drivers/char/mxser.c
@@ -556,7 +556,7 @@ static int mxser_initbrd(int board, struct mxser_hwconf *hwconf)
556 n = board * MXSER_PORTS_PER_BOARD; 556 n = board * MXSER_PORTS_PER_BOARD;
557 info = &mxvar_table[n]; 557 info = &mxvar_table[n];
558 /*if (verbose) */ { 558 /*if (verbose) */ {
559 printk(KERN_DEBUG " ttyM%d - ttyM%d ", 559 printk(KERN_DEBUG " ttyMI%d - ttyMI%d ",
560 n, n + hwconf->ports - 1); 560 n, n + hwconf->ports - 1);
561 printk(" max. baud rate = %d bps.\n", 561 printk(" max. baud rate = %d bps.\n",
562 hwconf->MaxCanSetBaudRate[0]); 562 hwconf->MaxCanSetBaudRate[0]);
@@ -717,7 +717,7 @@ static int mxser_init(void)
717 /* Initialize the tty_driver structure */ 717 /* Initialize the tty_driver structure */
718 memset(mxvar_sdriver, 0, sizeof(struct tty_driver)); 718 memset(mxvar_sdriver, 0, sizeof(struct tty_driver));
719 mxvar_sdriver->magic = TTY_DRIVER_MAGIC; 719 mxvar_sdriver->magic = TTY_DRIVER_MAGIC;
720 mxvar_sdriver->name = "ttyM"; 720 mxvar_sdriver->name = "ttyMI";
721 mxvar_sdriver->major = ttymajor; 721 mxvar_sdriver->major = ttymajor;
722 mxvar_sdriver->minor_start = 0; 722 mxvar_sdriver->minor_start = 0;
723 mxvar_sdriver->num = MXSER_PORTS + 1; 723 mxvar_sdriver->num = MXSER_PORTS + 1;