sugar/linux
1
0
Fork 0
Code Activity

Merge branch 'mach_memory_h' of git://git.linaro.org/people/nico/linux into devel-stable

Browse Source
This commit is contained in:
Russell King
2011-10-18 13:40:54 +01:00
parent a26bce1220 0cdc8b921d
commit cefd3e71ef
117 changed files with 347 additions and 1168 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
arch/arm/mach-ep93xx/include/mach/debug-macro.S
View File

@@ -11,7 +11,7 @@
*/
#include <mach/ep93xx-regs.h>
.macro addruart, rp, rv
.macro addruart, rp, rv, tmp
ldr \rp, =EP93XX_APB_PHYS_BASE @ Physical base
ldr \rv, =EP93XX_APB_VIRT_BASE @ virtual base
orr \rp, \rp, #0x000c0000