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-airlied' of /ssd/git/drm-nouveau-next into drm-linus
[pandora-kernel.git]
/
arch
/
arm
/
plat-omap
/
include
/
mach
/
debug-macro.S
diff --git
a/arch/arm/plat-omap/include/mach/debug-macro.S
b/arch/arm/plat-omap/include/mach/debug-macro.S
index
1b11f5c
..
ac24050
100644
(file)
--- a/
arch/arm/plat-omap/include/mach/debug-macro.S
+++ b/
arch/arm/plat-omap/include/mach/debug-macro.S
@@
-36,7
+36,7
@@
add \rx, \rx, #0x00004000 @ UART 3
#endif
-#elif
CONFIG_ARCH_OMAP3
+#elif
defined(CONFIG_ARCH_OMAP3) || defined(CONFIG_ARCH_OMAP4)
moveq \rx, #0x48000000 @ physical base address
movne \rx, #0xd8000000 @ virtual base
orr \rx, \rx, #0x0006a000