diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2011-10-31 18:11:46 -0400 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2011-10-31 19:25:01 -0400 |
| commit | 5725aeae5ff2e39f3815bbef788ee326c9afea2c (patch) | |
| tree | 4f32f936ba18384d48ab1e537b787a8ce666263f /arch/arm/mach-orion5x/include/mach/debug-macro.S | |
| parent | 43872fa788060eef91ae437957e0a5e39f1c56fd (diff) | |
| parent | 0cdc8b921d68817b687755b4f6ae20cd8ff1d026 (diff) | |
Merge branch 'depends/rmk/memory_h' into next/fixes
Fix up all conflicts between the memory.h cleanup and bug fixes.
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Diffstat (limited to 'arch/arm/mach-orion5x/include/mach/debug-macro.S')
| -rw-r--r-- | arch/arm/mach-orion5x/include/mach/debug-macro.S | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/mach-orion5x/include/mach/debug-macro.S b/arch/arm/mach-orion5x/include/mach/debug-macro.S index 5e3bf5b68aec..f340ed8f8dd0 100644 --- a/arch/arm/mach-orion5x/include/mach/debug-macro.S +++ b/arch/arm/mach-orion5x/include/mach/debug-macro.S | |||
| @@ -10,7 +10,7 @@ | |||
| 10 | 10 | ||
| 11 | #include <mach/orion5x.h> | 11 | #include <mach/orion5x.h> |
| 12 | 12 | ||
| 13 | .macro addruart, rp, rv | 13 | .macro addruart, rp, rv, tmp |
| 14 | ldr \rp, =ORION5X_REGS_PHYS_BASE | 14 | ldr \rp, =ORION5X_REGS_PHYS_BASE |
| 15 | ldr \rv, =ORION5X_REGS_VIRT_BASE | 15 | ldr \rv, =ORION5X_REGS_VIRT_BASE |
| 16 | orr \rp, \rp, #0x00012000 | 16 | orr \rp, \rp, #0x00012000 |