Merge /spare/repo/linux-2.6/

1 files changed, 6 insertions, 6 deletions

diff --git a/drivers/serial/m32r_sio.c b/drivers/serial/m32r_sio.c
index 08d61f13edc6..9b50560b9d16 100644
--- a/drivers/serial/m32r_sio.c
+++ b/drivers/serial/m32r_sio.c
@@ -724,22 +724,22 @@ static void m32r_sio_set_termios(struct uart_port *port,
 
         switch (termios->c_cflag & CSIZE) {
         case CS5:
-                cval = 0x00;
+                cval = UART_LCR_WLEN5;
                 break;
         case CS6:
-                cval = 0x01;
+                cval = UART_LCR_WLEN6;
                 break;
         case CS7:
-                cval = 0x02;
+                cval = UART_LCR_WLEN7;
                 break;
         default:
         case CS8:
-                cval = 0x03;
+                cval = UART_LCR_WLEN8;
                 break;
         }
 
         if (termios->c_cflag & CSTOPB)
-                cval |= 0x04;
+                cval |= UART_LCR_STOP;
         if (termios->c_cflag & PARENB)
                 cval |= UART_LCR_PARITY;
         if (!(termios->c_cflag & PARODD))
@@ -1123,7 +1123,7 @@ static int __init m32r_sio_console_setup(struct console *co, char *options)
         return uart_set_options(port, co, baud, parity, bits, flow);
 }
 
-extern struct uart_driver m32r_sio_reg;
+static struct uart_driver m32r_sio_reg;
 static struct console m32r_sio_console = {
         .name           = "ttyS",
         .write          = m32r_sio_console_write,