git.samba.org
/
sfrench
/
cifs-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'origin' into for-linus
[sfrench/cifs-2.6.git]
/
arch
/
arm
/
mach-at91
/
board-sam9rlek.c
diff --git
a/arch/arm/mach-at91/board-sam9rlek.c
b/arch/arm/mach-at91/board-sam9rlek.c
index cde056570a44a86771b11548cb9b8de6496bafbd..bd28e989e54eb48d5274170dfd8f1715dfbb2f51 100644
(file)
--- a/
arch/arm/mach-at91/board-sam9rlek.c
+++ b/
arch/arm/mach-at91/board-sam9rlek.c
@@
-43,7
+43,7
@@
static void __init ek_map_io(void)
/* Initialize processor: 12.000 MHz crystal */
at91sam9rl_initialize(12000000);
- /* D
GB
U on ttyS0. (Rx & Tx only) */
+ /* D
BG
U on ttyS0. (Rx & Tx only) */
at91_register_uart(0, 0, 0);
/* USART0 on ttyS1. (Rx, Tx, CTS, RTS) */