Skip to content

L
linux-davinci
Commit b20fd650 authored by Linus Torvalds's avatar Linus Torvalds
Browse files
Options

Merge master.kernel.org:/home/rmk/linux-2.6-serial

parents b38708fc f04da5de
Show whitespace changes
Inline Side-by-side
Showing with 2 additions and 2 deletions
drivers/serial/s3c2410.c
View file @ b20fd650
...@@ -753,8 +753,8 @@ static void s3c24xx_serial_set_termios(struct uart_port *port, ...@@ -753,8 +753,8 @@ static void s3c24xx_serial_set_termios(struct uart_port *port,
{ {
struct s3c2410_uartcfg *cfg = s3c24xx_port_to_cfg(port); struct s3c2410_uartcfg *cfg = s3c24xx_port_to_cfg(port);
struct s3c24xx_uart_port *ourport = to_ourport(port); struct s3c24xx_uart_port *ourport = to_ourport(port);
struct s3c24xx_uart_clksrc *clksrc; struct s3c24xx_uart_clksrc *clksrc = NULL;
struct clk *clk; struct clk *clk = NULL;
unsigned long flags; unsigned long flags;
unsigned int baud, quot; unsigned int baud, quot;
unsigned int ulcon; unsigned int ulcon;
......
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