diff options
| author | Russell King <rmk+kernel@arm.linux.org.uk> | 2011-10-18 08:40:54 -0400 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2011-10-18 08:40:54 -0400 |
| commit | cefd3e71efca6f4ef7f06f1fc507771d76072741 (patch) | |
| tree | d76cb7969435d5eccdbd3d081555d0a8203ede4a /arch/arm/mach-ep93xx | |
| parent | a26bce1220a4c5a7a074a779e6aad3cae63a94f7 (diff) | |
| parent | 0cdc8b921d68817b687755b4f6ae20cd8ff1d026 (diff) | |
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 @@ | |||
| 11 | */ | 11 | */ |
| 12 | #include <mach/ep93xx-regs.h> | 12 | #include <mach/ep93xx-regs.h> |
| 13 | 13 | ||
| 14 | .macro addruart, rp, rv | 14 | .macro addruart, rp, rv, tmp |
| 15 | ldr \rp, =EP93XX_APB_PHYS_BASE @ Physical base | 15 | ldr \rp, =EP93XX_APB_PHYS_BASE @ Physical base |
| 16 | ldr \rv, =EP93XX_APB_VIRT_BASE @ virtual base | 16 | ldr \rv, =EP93XX_APB_VIRT_BASE @ virtual base |
| 17 | orr \rp, \rp, #0x000c0000 | 17 | orr \rp, \rp, #0x000c0000 |