Merge bk://bk.arm.linux.org.uk/linux-2.6-serial

into ppc970.osdl.org:/home/torvalds/v2.6/linux

Merge bk://bk.arm.linux.org.uk/linux-2.6-serial
into ppc970.osdl.org:/home/torvalds/v2.6/linux
658591af · Linus Torvalds · 3a895e95 · a7e062c8 · 658591af
Commit 658591af authored Oct 06, 2004 by Linus Torvalds
Show whitespace changes
Inline Side-by-side

Showing with 1 addition and 1 deletion

drivers/serial/s3c2410.c drivers/serial/s3c2410.c +1 -1

No files found.
--- a/drivers/serial/s3c2410.c
+++ b/drivers/serial/s3c2410.c
@@ -675,7 +675,7 @@ serial_s3c2410_get_options(struct uart_port *port, int *baud,

 		default:
 		case S3C2410_LCON_PNONE:
-			/* nothing */
+			*parity = 'n';
 		}

 		/* now calculate the baud rate */