diff options
author | Arnd Bergmann | 2011-11-01 04:58:59 +0100 |
---|---|---|
committer | Arnd Bergmann | 2011-11-01 04:58:59 +0100 |
commit | cfaf8fc5b59527281e9ddc2e0e04e1127936e17f (patch) | |
tree | 975700d72e51f02c3c816a04fc5f141cdc4f6361 /arch/arm/mach-dove/include/mach/debug-macro.S | |
parent | Merge branch 'omap/cleanup' into next/cleanup2 (diff) | |
parent | ARM: switch from NO_MACH_MEMORY_H to NEED_MACH_MEMORY_H (diff) | |
download | kernel-qcow2-linux-cfaf8fc5b59527281e9ddc2e0e04e1127936e17f.tar.gz kernel-qcow2-linux-cfaf8fc5b59527281e9ddc2e0e04e1127936e17f.tar.xz kernel-qcow2-linux-cfaf8fc5b59527281e9ddc2e0e04e1127936e17f.zip |
Merge branch 'depends/rmk/memory_h' into next/cleanup2
There are lots of conflicts between the omap and exynos cleanups
and the memory.h remove series.
Conflicts:
arch/arm/mach-exynos4/mach-smdkc210.c
arch/arm/mach-exynos4/mach-smdkv310.c
arch/arm/mach-imx/mach-cpuimx27.c
arch/arm/mach-omap1/board-ams-delta.c
arch/arm/mach-omap1/board-generic.c
arch/arm/mach-omap1/board-h2.c
arch/arm/mach-omap1/board-h3.c
arch/arm/mach-omap1/board-nokia770.c
arch/arm/mach-omap1/board-osk.c
arch/arm/mach-omap1/board-palmte.c
arch/arm/mach-omap1/board-palmtt.c
arch/arm/mach-omap1/board-palmz71.c
arch/arm/mach-omap1/board-sx1.c
arch/arm/mach-omap1/board-voiceblue.c
arch/arm/mach-omap1/io.c
arch/arm/mach-omap2/board-generic.c
arch/arm/mach-omap2/io.c
arch/arm/plat-omap/io.c
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Diffstat (limited to 'arch/arm/mach-dove/include/mach/debug-macro.S')
-rw-r--r-- | arch/arm/mach-dove/include/mach/debug-macro.S | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/mach-dove/include/mach/debug-macro.S b/arch/arm/mach-dove/include/mach/debug-macro.S index da8bf2bad3b1..5929cbc59161 100644 --- a/arch/arm/mach-dove/include/mach/debug-macro.S +++ b/arch/arm/mach-dove/include/mach/debug-macro.S @@ -8,7 +8,7 @@ #include <mach/bridge-regs.h> - .macro addruart, rp, rv + .macro addruart, rp, rv, tmp ldr \rp, =DOVE_SB_REGS_PHYS_BASE ldr \rv, =DOVE_SB_REGS_VIRT_BASE orr \rp, \rp, #0x00012000 |