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 'for-linus' of git://git.armlinux.org.uk/~rmk/linux-arm
[sfrench/cifs-2.6.git]
/
arch
/
arm
/
include
/
debug
/
omap2plus.S
diff --git
a/arch/arm/include/debug/omap2plus.S
b/arch/arm/include/debug/omap2plus.S
index 8be08d907a16990a3516d32d085188fcc962822b..192a7583999ce7c5ebc26f012342e831d7d657fb 100644
(file)
--- a/
arch/arm/include/debug/omap2plus.S
+++ b/
arch/arm/include/debug/omap2plus.S
@@
-22,6
+22,7
@@
#define UART_OFFSET(addr) ((addr) & 0x00ffffff)
.pushsection .data
+ .align 2
omap_uart_phys: .word 0
omap_uart_virt: .word 0
omap_uart_lsr: .word 0