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-orion5x | |
| 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-orion5x')
| -rw-r--r-- | arch/arm/mach-orion5x/include/mach/debug-macro.S | 2 | ||||
| -rw-r--r-- | arch/arm/mach-orion5x/include/mach/memory.h | 12 |
2 files changed, 1 insertions, 13 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 @@ #include <mach/orion5x.h> - .macro addruart, rp, rv + .macro addruart, rp, rv, tmp ldr \rp, =ORION5X_REGS_PHYS_BASE ldr \rv, =ORION5X_REGS_VIRT_BASE orr \rp, \rp, #0x00012000 diff --git a/arch/arm/mach-orion5x/include/mach/memory.h b/arch/arm/mach-orion5x/include/mach/memory.h deleted file mode 100644 index 6769917882fe..000000000000 --- a/arch/arm/mach-orion5x/include/mach/memory.h +++ /dev/null @@ -1,12 +0,0 @@ -/* - * arch/arm/mach-orion5x/include/mach/memory.h - * - * Marvell Orion memory definitions - */ - -#ifndef __ASM_ARCH_MEMORY_H -#define __ASM_ARCH_MEMORY_H - -#define PLAT_PHYS_OFFSET UL(0x00000000) - -#endif |