diff options
| author | Rob Herring <rob.herring@calxeda.com> | 2011-10-24 15:02:37 -0400 |
|---|---|---|
| committer | Rob Herring <rob.herring@calxeda.com> | 2011-10-24 15:02:37 -0400 |
| commit | 3a8254364277fabe01bc0e12b9691722939f5ef3 (patch) | |
| tree | 0befa43780509144cc840f767859006409e0506d /arch/arm/mach-s5p64x0/include/mach/memory.h | |
| parent | 976d167615b64e14bc1491ca51d424e2ba9a5e84 (diff) | |
| parent | 34471a9168c8bfd7f0d00989a7b0797ad27d585e (diff) | |
Merge remote-tracking branch 'rmk/devel-stable' into HEAD
Diffstat (limited to 'arch/arm/mach-s5p64x0/include/mach/memory.h')
| -rw-r--r-- | arch/arm/mach-s5p64x0/include/mach/memory.h | 19 |
1 files changed, 0 insertions, 19 deletions
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 */ | ||