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-footbridge | |
| 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-footbridge')
| -rw-r--r-- | arch/arm/mach-footbridge/include/mach/debug-macro.S | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/arm/mach-footbridge/include/mach/debug-macro.S b/arch/arm/mach-footbridge/include/mach/debug-macro.S index 1be2eeb7a0a0..e5acde25ffc5 100644 --- a/arch/arm/mach-footbridge/include/mach/debug-macro.S +++ b/arch/arm/mach-footbridge/include/mach/debug-macro.S | |||
| @@ -15,7 +15,7 @@ | |||
| 15 | 15 | ||
| 16 | #ifndef CONFIG_DEBUG_DC21285_PORT | 16 | #ifndef CONFIG_DEBUG_DC21285_PORT |
| 17 | /* For NetWinder debugging */ | 17 | /* For NetWinder debugging */ |
| 18 | .macro addruart, rp, rv | 18 | .macro addruart, rp, rv, tmp |
| 19 | mov \rp, #0x000003f8 | 19 | mov \rp, #0x000003f8 |
| 20 | orr \rv, \rp, #0xff000000 @ virtual | 20 | orr \rv, \rp, #0xff000000 @ virtual |
| 21 | orr \rp, \rp, #0x7c000000 @ physical | 21 | orr \rp, \rp, #0x7c000000 @ physical |
| @@ -31,7 +31,7 @@ | |||
| 31 | .equ dc21285_high, ARMCSR_BASE & 0xff000000 | 31 | .equ dc21285_high, ARMCSR_BASE & 0xff000000 |
| 32 | .equ dc21285_low, ARMCSR_BASE & 0x00ffffff | 32 | .equ dc21285_low, ARMCSR_BASE & 0x00ffffff |
| 33 | 33 | ||
| 34 | .macro addruart, rp, rv | 34 | .macro addruart, rp, rv, tmp |
| 35 | .if dc21285_low | 35 | .if dc21285_low |
| 36 | mov \rp, #dc21285_low | 36 | mov \rp, #dc21285_low |
| 37 | .else | 37 | .else |