ARM: mach-s5pc100: remove mach/memory.h
authorNicolas Pitre <nicolas.pitre@linaro.org>
Wed, 6 Jul 2011 02:52:55 +0000 (22:52 -0400)
committerNicolas Pitre <nico@fluxnic.net>
Thu, 13 Oct 2011 16:49:43 +0000 (12:49 -0400)
Signed-off-by: Nicolas Pitre <nicolas.pitre@linaro.org>
arch/arm/Kconfig
arch/arm/mach-s5pc100/include/mach/memory.h [deleted file]

index 549e77a..09da28b 100644 (file)
@@ -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 (file)
index bda4e79..0000000
+++ /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