diff options
author | Russell King <rmk+kernel@arm.linux.org.uk> | 2011-10-18 16:40:54 +0400 |
---|---|---|
committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2011-10-18 16:40:54 +0400 |
commit | cefd3e71efca6f4ef7f06f1fc507771d76072741 (patch) | |
tree | d76cb7969435d5eccdbd3d081555d0a8203ede4a /arch/arm/mach-mmp/include/mach/memory.h | |
parent | a26bce1220a4c5a7a074a779e6aad3cae63a94f7 (diff) | |
parent | 0cdc8b921d68817b687755b4f6ae20cd8ff1d026 (diff) | |
download | linux-cefd3e71efca6f4ef7f06f1fc507771d76072741.tar.xz |
Merge branch 'mach_memory_h' of git://git.linaro.org/people/nico/linux into devel-stable
Diffstat (limited to 'arch/arm/mach-mmp/include/mach/memory.h')
-rw-r--r-- | arch/arm/mach-mmp/include/mach/memory.h | 14 |
1 files changed, 0 insertions, 14 deletions
diff --git a/arch/arm/mach-mmp/include/mach/memory.h b/arch/arm/mach-mmp/include/mach/memory.h deleted file mode 100644 index d68b50a2d6a0..000000000000 --- a/arch/arm/mach-mmp/include/mach/memory.h +++ /dev/null @@ -1,14 +0,0 @@ -/* - * linux/arch/arm/mach-mmp/include/mach/memory.h - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License version 2 as - * published by the Free Software Foundation. - */ - -#ifndef __ASM_MACH_MEMORY_H -#define __ASM_MACH_MEMORY_H - -#define PLAT_PHYS_OFFSET UL(0x00000000) - -#endif /* __ASM_MACH_MEMORY_H */ |