diff options
Diffstat (limited to 'arch/arm/mach-orion5x/include/mach')
-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 @@ | |||
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 |
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 @@ | |||
1 | /* | ||
2 | * arch/arm/mach-orion5x/include/mach/memory.h | ||
3 | * | ||
4 | * Marvell Orion memory definitions | ||
5 | */ | ||
6 | |||
7 | #ifndef __ASM_ARCH_MEMORY_H | ||
8 | #define __ASM_ARCH_MEMORY_H | ||
9 | |||
10 | #define PLAT_PHYS_OFFSET UL(0x00000000) | ||
11 | |||
12 | #endif | ||