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 'master' into next
[sfrench/cifs-2.6.git]
/
arch
/
arm
/
mach-at91
/
board-usb-a9260.c
diff --git
a/arch/arm/mach-at91/board-usb-a9260.c
b/arch/arm/mach-at91/board-usb-a9260.c
index d13304c0bc45eff75eabe5bb9310cf724bfcd74c..905d6ef768078dd4e75f0ac2058c267091161315 100644
(file)
--- a/
arch/arm/mach-at91/board-usb-a9260.c
+++ b/
arch/arm/mach-at91/board-usb-a9260.c
@@
-53,7
+53,7
@@
static void __init ek_map_io(void)
/* Initialize processor: 12.000 MHz crystal */
at91sam9260_initialize(12000000);
- /* D
GB
U on ttyS0. (Rx & Tx only) */
+ /* D
BG
U on ttyS0. (Rx & Tx only) */
at91_register_uart(0, 0, 0);
/* set serial console to ttyS0 (ie, DBGU) */