diff options
| author | Russell King <rmk+kernel@arm.linux.org.uk> | 2011-10-18 08:40:54 -0400 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2011-10-18 08:40:54 -0400 |
| commit | cefd3e71efca6f4ef7f06f1fc507771d76072741 (patch) | |
| tree | d76cb7969435d5eccdbd3d081555d0a8203ede4a /arch/arm/mach-s3c2410/include/mach/memory.h | |
| parent | a26bce1220a4c5a7a074a779e6aad3cae63a94f7 (diff) | |
| parent | 0cdc8b921d68817b687755b4f6ae20cd8ff1d026 (diff) | |
Merge branch 'mach_memory_h' of git://git.linaro.org/people/nico/linux into devel-stable
Diffstat (limited to 'arch/arm/mach-s3c2410/include/mach/memory.h')
| -rw-r--r-- | arch/arm/mach-s3c2410/include/mach/memory.h | 16 |
1 files changed, 0 insertions, 16 deletions
diff --git a/arch/arm/mach-s3c2410/include/mach/memory.h b/arch/arm/mach-s3c2410/include/mach/memory.h deleted file mode 100644 index f92b97b89c0c..000000000000 --- a/arch/arm/mach-s3c2410/include/mach/memory.h +++ /dev/null | |||
| @@ -1,16 +0,0 @@ | |||
| 1 | /* arch/arm/mach-s3c2410/include/mach/memory.h | ||
| 2 | * from arch/arm/mach-rpc/include/mach/memory.h | ||
| 3 | * | ||
| 4 | * Copyright (C) 1996,1997,1998 Russell King. | ||
| 5 | * | ||
| 6 | * This program is free software; you can redistribute it and/or modify | ||
| 7 | * it under the terms of the GNU General Public License version 2 as | ||
| 8 | * published by the Free Software Foundation. | ||
| 9 | */ | ||
| 10 | |||
| 11 | #ifndef __ASM_ARCH_MEMORY_H | ||
| 12 | #define __ASM_ARCH_MEMORY_H | ||
| 13 | |||
| 14 | #define PLAT_PHYS_OFFSET UL(0x30000000) | ||
| 15 | |||
| 16 | #endif | ||