summaryrefslogtreecommitdiff
path: root/arch/arm
diff options
context:
space:
mode:
authorNicolas Pitre <nicolas.pitre@linaro.org>2011-07-06 06:52:55 +0400
committerNicolas Pitre <nico@fluxnic.net>2011-10-13 20:49:43 +0400
commit476eb37ad799e9ed5f540a08485359258ce95549 (patch)
tree08aa6d89c742a86ba883d5c2f3a63ad8dfa224c5 /arch/arm
parentf8bc5ddf139e05b21a768bc837d48f3db61c0d96 (diff)
downloadlinux-476eb37ad799e9ed5f540a08485359258ce95549.tar.xz
ARM: mach-s5pc100: remove mach/memory.h
Signed-off-by: Nicolas Pitre <nicolas.pitre@linaro.org>
Diffstat (limited to 'arch/arm')
-rw-r--r--arch/arm/Kconfig1
-rw-r--r--arch/arm/mach-s5pc100/include/mach/memory.h18
2 files changed, 1 insertions, 18 deletions
diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig
index 549e77a05e9a..09da28b66a87 100644
--- a/arch/arm/Kconfig
+++ b/arch/arm/Kconfig
@@ -789,6 +789,7 @@ config ARCH_S5PC100
select HAVE_S3C2410_I2C if I2C
select HAVE_S3C_RTC if RTC_CLASS
select HAVE_S3C2410_WATCHDOG if WATCHDOG
+ select NO_MACH_MEMORY_H
help
Samsung S5PC100 series based systems
diff --git a/arch/arm/mach-s5pc100/include/mach/memory.h b/arch/arm/mach-s5pc100/include/mach/memory.h
deleted file mode 100644
index bda4e79fd5fc..000000000000
--- a/arch/arm/mach-s5pc100/include/mach/memory.h
+++ /dev/null
@@ -1,18 +0,0 @@
-/* arch/arm/mach-s5pc100/include/mach/memory.h
- *
- * Copyright 2008 Samsung Electronics Co.
- * Byungho Min <bhmin@samsung.com>
- *
- * Based on mach-s3c6400/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_ARCH_MEMORY_H
-#define __ASM_ARCH_MEMORY_H
-
-#define PLAT_PHYS_OFFSET UL(0x20000000)
-
-#endif