diff options
| author | Russell King <rmk+kernel@arm.linux.org.uk> | 2011-10-18 14:40:54 +0200 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2011-10-18 14:40:54 +0200 |
| commit | cefd3e71efca6f4ef7f06f1fc507771d76072741 (patch) | |
| tree | d76cb7969435d5eccdbd3d081555d0a8203ede4a /arch/arm/mach-ep93xx | |
| parent | ARM: 7127/1: hw_breakpoint: skip v7-specific reset on v6 cores (diff) | |
| parent | ARM: switch from NO_MACH_MEMORY_H to NEED_MACH_MEMORY_H (diff) | |
| download | linux-cefd3e71efca6f4ef7f06f1fc507771d76072741.tar.xz linux-cefd3e71efca6f4ef7f06f1fc507771d76072741.zip | |
Merge branch 'mach_memory_h' of git://git.linaro.org/people/nico/linux into devel-stable
Diffstat (limited to 'arch/arm/mach-ep93xx')
| -rw-r--r-- | arch/arm/mach-ep93xx/include/mach/debug-macro.S | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/mach-ep93xx/include/mach/debug-macro.S b/arch/arm/mach-ep93xx/include/mach/debug-macro.S index b25bc9076367..af54e43132cf 100644 --- a/arch/arm/mach-ep93xx/include/mach/debug-macro.S +++ b/arch/arm/mach-ep93xx/include/mach/debug-macro.S @@ -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 |