diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2011-11-01 08:47:27 -0400 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2011-11-01 08:47:27 -0400 |
| commit | df80442d1ee2902c2e39f90f18160f2e08d14c06 (patch) | |
| tree | e7c2080df1a5851e0c5353c48a211d9af91aae68 /arch/arm/mach-s3c64xx/include | |
| parent | 8aca3ab5865f8cfbde841b6daf9442cc2279ced3 (diff) | |
| parent | 0cdc8b921d68817b687755b4f6ae20cd8ff1d026 (diff) | |
Merge branch 'depends/rmk/memory_h' into next/cleanup2
Theis resolves lots of simple conflicts between the omap
cleanup and the mach/memory.h removal series.
Conflicts:
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-s3c64xx/include')
| -rw-r--r-- | arch/arm/mach-s3c64xx/include/mach/debug-macro.S | 2 | ||||
| -rw-r--r-- | arch/arm/mach-s3c64xx/include/mach/memory.h | 20 |
2 files changed, 1 insertions, 21 deletions
diff --git a/arch/arm/mach-s3c64xx/include/mach/debug-macro.S b/arch/arm/mach-s3c64xx/include/mach/debug-macro.S index a29e70550c70..c0c076a90f27 100644 --- a/arch/arm/mach-s3c64xx/include/mach/debug-macro.S +++ b/arch/arm/mach-s3c64xx/include/mach/debug-macro.S | |||
| @@ -21,7 +21,7 @@ | |||
| 21 | * aligned and add in the offset when we load the value here. | 21 | * aligned and add in the offset when we load the value here. |
| 22 | */ | 22 | */ |
| 23 | 23 | ||
| 24 | .macro addruart, rp, rv | 24 | .macro addruart, rp, rv, tmp |
| 25 | ldr \rp, = S3C_PA_UART | 25 | ldr \rp, = S3C_PA_UART |
| 26 | ldr \rv, = (S3C_VA_UART + S3C_PA_UART & 0xfffff) | 26 | ldr \rv, = (S3C_VA_UART + S3C_PA_UART & 0xfffff) |
| 27 | #if CONFIG_DEBUG_S3C_UART != 0 | 27 | #if CONFIG_DEBUG_S3C_UART != 0 |
diff --git a/arch/arm/mach-s3c64xx/include/mach/memory.h b/arch/arm/mach-s3c64xx/include/mach/memory.h deleted file mode 100644 index 4760cdae1eb6..000000000000 --- a/arch/arm/mach-s3c64xx/include/mach/memory.h +++ /dev/null | |||
| @@ -1,20 +0,0 @@ | |||
| 1 | /* arch/arm/mach-s3c6400/include/mach/memory.h | ||
| 2 | * | ||
| 3 | * Copyright 2008 Openmoko, Inc. | ||
| 4 | * Copyright 2008 Simtec Electronics | ||
| 5 | * Ben Dooks <ben@simtec.co.uk> | ||
| 6 | * http://armlinux.simtec.co.uk/ | ||
| 7 | * | ||
| 8 | * This program is free software; you can redistribute it and/or modify | ||
| 9 | * it under the terms of the GNU General Public License version 2 as | ||
| 10 | * published by the Free Software Foundation. | ||
| 11 | */ | ||
| 12 | |||
| 13 | #ifndef __ASM_ARCH_MEMORY_H | ||
| 14 | #define __ASM_ARCH_MEMORY_H | ||
| 15 | |||
| 16 | #define PLAT_PHYS_OFFSET UL(0x50000000) | ||
| 17 | |||
| 18 | #define CONSISTENT_DMA_SIZE SZ_8M | ||
| 19 | |||
| 20 | #endif | ||