Commit 658591af authored by Linus Torvalds's avatar Linus Torvalds

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

into ppc970.osdl.org:/home/torvalds/v2.6/linux
parents 3a895e95 a7e062c8
...@@ -675,7 +675,7 @@ serial_s3c2410_get_options(struct uart_port *port, int *baud, ...@@ -675,7 +675,7 @@ serial_s3c2410_get_options(struct uart_port *port, int *baud,
default: default:
case S3C2410_LCON_PNONE: case S3C2410_LCON_PNONE:
/* nothing */ *parity = 'n';
} }
/* now calculate the baud rate */ /* now calculate the baud rate */
......
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