aboutsummaryrefslogtreecommitdiffstats
path: root/arch
diff options
context:
space:
mode:
Diffstat (limited to 'arch')
-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
789 select HAVE_S3C2410_I2C if I2C 789 select HAVE_S3C2410_I2C if I2C
790 select HAVE_S3C_RTC if RTC_CLASS 790 select HAVE_S3C_RTC if RTC_CLASS
791 select HAVE_S3C2410_WATCHDOG if WATCHDOG 791 select HAVE_S3C2410_WATCHDOG if WATCHDOG
792 select NO_MACH_MEMORY_H
792 help 793 help
793 Samsung S5PC100 series based systems 794 Samsung S5PC100 series based systems
794 795
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 @@
1/* arch/arm/mach-s5pc100/include/mach/memory.h
2 *
3 * Copyright 2008 Samsung Electronics Co.
4 * Byungho Min <bhmin@samsung.com>
5 *
6 * Based on mach-s3c6400/include/mach/memory.h
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(0x20000000)
17
18#endif