git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jbarnes...
[pandora-kernel.git]
/
drivers
/
serial
/
atmel_serial.c
diff --git
a/drivers/serial/atmel_serial.c
b/drivers/serial/atmel_serial.c
index
c065a70
..
42be8b0
100644
(file)
--- a/
drivers/serial/atmel_serial.c
+++ b/
drivers/serial/atmel_serial.c
@@
-1318,7
+1318,7
@@
static void __init atmel_console_get_options(struct uart_port *port, int *baud,
* If the baud rate generator isn't running, the port wasn't
* initialized by the boot loader.
*/
- quot = UART_GET_BRGR(port);
+ quot = UART_GET_BRGR(port)
& ATMEL_US_CD
;
if (!quot)
return;