diff options
| author | Linus Torvalds <torvalds@g5.osdl.org> | 2006-01-14 22:43:21 -0500 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-01-14 22:43:21 -0500 |
| commit | 8d5c315059460e665c804d5a9b641f7f0a1e9dd7 (patch) | |
| tree | b9c598b2ac7a4fd7cf121ce733b98b0f18b8a1df /drivers | |
| parent | a9df3d0f312f4b1aefec76ae5ee86cccbf7cd4e0 (diff) | |
| parent | 3f471126ee53feb5e9b210ea2f525ed3bb9b7a7f (diff) | |
Merge master.kernel.org:/home/rmk/linux-2.6-arm
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/serial/imx.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/serial/imx.c b/drivers/serial/imx.c index 5c098be9346b..587cc6a95114 100644 --- a/drivers/serial/imx.c +++ b/drivers/serial/imx.c | |||
| @@ -499,7 +499,7 @@ imx_set_termios(struct uart_port *port, struct termios *termios, | |||
| 499 | ucr2 |= UCR2_STPB; | 499 | ucr2 |= UCR2_STPB; |
| 500 | if (termios->c_cflag & PARENB) { | 500 | if (termios->c_cflag & PARENB) { |
| 501 | ucr2 |= UCR2_PREN; | 501 | ucr2 |= UCR2_PREN; |
| 502 | if (!(termios->c_cflag & PARODD)) | 502 | if (termios->c_cflag & PARODD) |
| 503 | ucr2 |= UCR2_PROE; | 503 | ucr2 |= UCR2_PROE; |
| 504 | } | 504 | } |
| 505 | 505 | ||