diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2011-10-31 23:58:59 -0400 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2011-10-31 23:58:59 -0400 |
| commit | cfaf8fc5b59527281e9ddc2e0e04e1127936e17f (patch) | |
| tree | 975700d72e51f02c3c816a04fc5f141cdc4f6361 /arch/arm/mach-s5p64x0/include/mach | |
| parent | c6c3a3a03e6de52866bc81a32fc551733625d553 (diff) | |
| parent | 0cdc8b921d68817b687755b4f6ae20cd8ff1d026 (diff) | |
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-s5p64x0/include/mach')
| -rw-r--r-- | arch/arm/mach-s5p64x0/include/mach/debug-macro.S | 2 | ||||
| -rw-r--r-- | arch/arm/mach-s5p64x0/include/mach/memory.h | 19 |
2 files changed, 1 insertions, 20 deletions
diff --git a/arch/arm/mach-s5p64x0/include/mach/debug-macro.S b/arch/arm/mach-s5p64x0/include/mach/debug-macro.S index 79b04e6a6f8e..e80ba3c69814 100644 --- a/arch/arm/mach-s5p64x0/include/mach/debug-macro.S +++ b/arch/arm/mach-s5p64x0/include/mach/debug-macro.S | |||
| @@ -15,7 +15,7 @@ | |||
| 15 | 15 | ||
| 16 | #include <plat/regs-serial.h> | 16 | #include <plat/regs-serial.h> |
| 17 | 17 | ||
| 18 | .macro addruart, rp, rv | 18 | .macro addruart, rp, rv, tmp |
| 19 | mov \rp, #0xE0000000 | 19 | mov \rp, #0xE0000000 |
| 20 | orr \rp, \rp, #0x00100000 | 20 | orr \rp, \rp, #0x00100000 |
| 21 | ldr \rp, [\rp, #0x118 ] | 21 | ldr \rp, [\rp, #0x118 ] |
diff --git a/arch/arm/mach-s5p64x0/include/mach/memory.h b/arch/arm/mach-s5p64x0/include/mach/memory.h deleted file mode 100644 index 365a6eb4b88f..000000000000 --- a/arch/arm/mach-s5p64x0/include/mach/memory.h +++ /dev/null | |||
| @@ -1,19 +0,0 @@ | |||
| 1 | /* linux/arch/arm/mach-s5p64x0/include/mach/memory.h | ||
| 2 | * | ||
| 3 | * Copyright (c) 2009-2010 Samsung Electronics Co., Ltd. | ||
| 4 | * http://www.samsung.com | ||
| 5 | * | ||
| 6 | * S5P64X0 - Memory definitions | ||
| 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 __FILE__ | ||
| 15 | |||
| 16 | #define PLAT_PHYS_OFFSET UL(0x20000000) | ||
| 17 | #define CONSISTENT_DMA_SIZE SZ_8M | ||
| 18 | |||
| 19 | #endif /* __ASM_ARCH_MEMORY_H */ | ||