diff options
author | Nicolas Pitre <nicolas.pitre@linaro.org> | 2011-09-02 21:48:28 -0400 |
---|---|---|
committer | Nicolas Pitre <nico@fluxnic.net> | 2011-10-13 12:49:51 -0400 |
commit | b4be3999d1895c9697580574ca4ea52d84bc4ddd (patch) | |
tree | 621bde9b2acb17ac84cb5dde4cecd670704713e9 /arch | |
parent | c039bad00f21a025df6fcb238578023c2cc881bf (diff) |
ARM: mach-s3c64xx: remove mach/memory.h
Signed-off-by: Nicolas Pitre <nicolas.pitre@linaro.org>
Diffstat (limited to 'arch')
-rw-r--r-- | arch/arm/Kconfig | 1 | ||||
-rw-r--r-- | arch/arm/mach-s3c64xx/include/mach/memory.h | 18 |
2 files changed, 1 insertions, 18 deletions
diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig index 408d413826cb..a87deac9f768 100644 --- a/arch/arm/Kconfig +++ b/arch/arm/Kconfig | |||
@@ -765,6 +765,7 @@ config ARCH_S3C64XX | |||
765 | select SAMSUNG_GPIOLIB_4BIT | 765 | select SAMSUNG_GPIOLIB_4BIT |
766 | select HAVE_S3C2410_I2C if I2C | 766 | select HAVE_S3C2410_I2C if I2C |
767 | select HAVE_S3C2410_WATCHDOG if WATCHDOG | 767 | select HAVE_S3C2410_WATCHDOG if WATCHDOG |
768 | select NO_MACH_MEMORY_H | ||
768 | help | 769 | help |
769 | Samsung S3C64XX series based systems | 770 | Samsung S3C64XX series based systems |
770 | 771 | ||
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 b704669f95ff..000000000000 --- a/arch/arm/mach-s3c64xx/include/mach/memory.h +++ /dev/null | |||
@@ -1,18 +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 | #endif | ||