Commit ae25f8ec authored by Jiri Slaby's avatar Jiri Slaby Committed by Linus Torvalds

[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: default avatarAlan Cox <alan@lxorguk.ukuu.org.uk>
Signed-off-by: default avatarJiri Slaby <jirislaby@gmail.com>
Signed-off-by: default avatarAndrew Morton <akpm@osdl.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parent 10731b88
...@@ -556,7 +556,7 @@ static int mxser_initbrd(int board, struct mxser_hwconf *hwconf) ...@@ -556,7 +556,7 @@ static int mxser_initbrd(int board, struct mxser_hwconf *hwconf)
n = board * MXSER_PORTS_PER_BOARD; n = board * MXSER_PORTS_PER_BOARD;
info = &mxvar_table[n]; info = &mxvar_table[n];
/*if (verbose) */ { /*if (verbose) */ {
printk(KERN_DEBUG " ttyM%d - ttyM%d ", printk(KERN_DEBUG " ttyMI%d - ttyMI%d ",
n, n + hwconf->ports - 1); n, n + hwconf->ports - 1);
printk(" max. baud rate = %d bps.\n", printk(" max. baud rate = %d bps.\n",
hwconf->MaxCanSetBaudRate[0]); hwconf->MaxCanSetBaudRate[0]);
...@@ -717,7 +717,7 @@ static int mxser_init(void) ...@@ -717,7 +717,7 @@ static int mxser_init(void)
/* Initialize the tty_driver structure */ /* Initialize the tty_driver structure */
memset(mxvar_sdriver, 0, sizeof(struct tty_driver)); memset(mxvar_sdriver, 0, sizeof(struct tty_driver));
mxvar_sdriver->magic = TTY_DRIVER_MAGIC; mxvar_sdriver->magic = TTY_DRIVER_MAGIC;
mxvar_sdriver->name = "ttyM"; mxvar_sdriver->name = "ttyMI";
mxvar_sdriver->major = ttymajor; mxvar_sdriver->major = ttymajor;
mxvar_sdriver->minor_start = 0; mxvar_sdriver->minor_start = 0;
mxvar_sdriver->num = MXSER_PORTS + 1; mxvar_sdriver->num = MXSER_PORTS + 1;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment