diff -urN linux-2.4.5-rmk7-np2/drivers/char/serial_core.c linux-2.4.5-rmk7-np2-ssv1/drivers/char/serial_core.c
--- linux-2.4.5-rmk7-np2/drivers/char/serial_core.c	Sat Jul 13 19:40:18 2002
+++ linux-2.4.5-rmk7-np2-ssv1/drivers/char/serial_core.c	Wed Oct 10 18:56:02 2001
@@ -1230,7 +1230,6 @@
 	struct uart_register *reg = (struct uart_register *)tty->driver.driver_state;
 	struct uart_info *info;
 	int retval, line = MINOR(tty->device) - tty->driver.minor_start;
-	int changed_termios = 0;
 
 #ifdef DEBUG
 	printk("uart_open(%d) called\n", line);
@@ -1277,15 +1276,15 @@
 		goto out;
 	}
 
+#ifdef CONFIG_PM
 	/*
 	 * Make sure the device is in D0 state.
 	 */
 	if (info->state->count == 1)
-#ifdef CONFIG_PM
 		pm_send(info->state->pm, PM_RESUME, (void *)0);
 #else
-		if (info->port->ops->pm)
-			info->port->ops->pm(info->port, 0, 3);
+	if (info->port->ops->pm)
+		info->port->ops->pm(info->port, 0, 3);
 #endif
 
 	/*
@@ -1305,7 +1304,7 @@
 			*tty->termios = info->state->normal_termios;
 		else
 			*tty->termios = info->state->callout_termios;
-		changed_termios = 1;
+		uart_change_speed(info, NULL);
 	}
 #ifdef CONFIG_SERIAL_CORE_CONSOLE
 	/*
@@ -1316,13 +1315,9 @@
 		if (c && c->cflag && c->index == line) {
 			tty->termios->c_cflag = c->cflag;
 			c->cflag = 0;
-			changed_termios = 1;
 		}
 	}
 #endif
-	if (changed_termios)
-		uart_change_speed(info, NULL);
-
 	info->session = current->session;
 	info->pgrp = current->pgrp;
 	return 0;
diff -urN linux-2.4.5-rmk7-np2/drivers/char/serial_sa1100.c linux-2.4.5-rmk7-np2-ssv1/drivers/char/serial_sa1100.c
--- linux-2.4.5-rmk7-np2/drivers/char/serial_sa1100.c	Sat Jul 13 19:40:18 2002
+++ linux-2.4.5-rmk7-np2-ssv1/drivers/char/serial_sa1100.c	Wed Oct 10 18:56:02 2001
@@ -680,10 +680,10 @@
 static struct uart_register sa1100_reg = {
 	owner:			THIS_MODULE,
 	normal_major:		SERIAL_SA1100_MAJOR,
-	normal_name:		"ttySA%d",
+	normal_name:		"ttySA",
 	normal_driver:		&normal,
 	callout_major:		CALLOUT_SA1100_MAJOR,
-	callout_name:		"cusa%d",
+	callout_name:		"cusa",
 	callout_driver:		&callout,
 	table:			sa1100_table,
 	termios:		sa1100_termios,