Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit b20fd650 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

parents b38708fc f04da5de

drivers/serial/s3c2410.c

+2 −2
Original line number Original line Diff line number Diff line
@@ -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;