diff options
| author | Linus Torvalds <torvalds@g5.osdl.org> | 2005-09-29 12:00:04 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2005-09-29 12:00:04 -0400 |
| commit | b20fd6508c565df04a6b5816f17e03b04d4f924d (patch) | |
| tree | a280e4a780f15a872b1b1bd61b5935613b591fbb | |
| parent | b38708fca9cc60d8a073a67c3b366116e38011c5 (diff) | |
| parent | f04da5def8c460b1b52d3142da827ab01efa3a15 (diff) | |
Merge master.kernel.org:/home/rmk/linux-2.6-serial
| -rw-r--r-- | drivers/serial/s3c2410.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/serial/s3c2410.c b/drivers/serial/s3c2410.c index c361c6fb0809..1195e6a0901a 100644 --- a/drivers/serial/s3c2410.c +++ b/drivers/serial/s3c2410.c | |||
| @@ -753,8 +753,8 @@ static void s3c24xx_serial_set_termios(struct uart_port *port, | |||
| 753 | { | 753 | { |
| 754 | struct s3c2410_uartcfg *cfg = s3c24xx_port_to_cfg(port); | 754 | struct s3c2410_uartcfg *cfg = s3c24xx_port_to_cfg(port); |
| 755 | struct s3c24xx_uart_port *ourport = to_ourport(port); | 755 | struct s3c24xx_uart_port *ourport = to_ourport(port); |
| 756 | struct s3c24xx_uart_clksrc *clksrc; | 756 | struct s3c24xx_uart_clksrc *clksrc = NULL; |
| 757 | struct clk *clk; | 757 | struct clk *clk = NULL; |
| 758 | unsigned long flags; | 758 | unsigned long flags; |
| 759 | unsigned int baud, quot; | 759 | unsigned int baud, quot; |
| 760 | unsigned int ulcon; | 760 | unsigned int ulcon; |