Merge branch 'master' of lpclinux.com:linux-2.6.34-lpc32xx
authorKevin Wells <wellsk40@gmail.com>
Wed, 16 Feb 2011 01:04:23 +0000 (17:04 -0800)
committerKevin Wells <wellsk40@gmail.com>
Wed, 16 Feb 2011 01:04:23 +0000 (17:04 -0800)
drivers/serial/lpc32xx_hs.c

index becbeca..f66ec1e 100644 (file)
@@ -177,7 +177,7 @@ static int __init lpc32xx_hsuart_console_setup(struct console *co,
        return uart_set_options(port, co, baud, parity, bits, flow);
 }
 
-static struct uart_driver lpc32xx_hsuart_reg;
+static struct uart_driver lpc32xx_hs_reg;
 static struct console lpc32xx_hsuart_console = {
        .name           = LPC32XX_TTY_NAME,
        .write          = lpc32xx_hsuart_console_write,
@@ -185,7 +185,7 @@ static struct console lpc32xx_hsuart_console = {
        .setup          = lpc32xx_hsuart_console_setup,
        .flags          = CON_PRINTBUFFER,
        .index          = -1,
-       .data           = &lpc32xx_hsuart_reg,
+       .data           = &lpc32xx_hs_reg,
 };
 
 static int __init lpc32xx_hsuart_console_init(void)