From c45f7fec5b6a9ba17762a8e01ec6380ed66b1837 Mon Sep 17 00:00:00 2001 From: Nicolas Pitre Date: Tue, 5 Jul 2011 22:52:55 -0400 Subject: [PATCH] --- yaml --- r: 270207 b: refs/heads/master c: 476eb37ad799e9ed5f540a08485359258ce95549 h: refs/heads/master i: 270205: a3f06f382155c5aa32bc264b18222c9f1b2b8a8c 270203: e87c20148baf4c5bac07cf8323e68d507adde987 270199: 7c1b0dbd4951f051ff1917c0628a40c3f876f7a2 270191: 78cbd4642d7cdb067f968024b10d1412e8b53ac6 270175: d05d2148efdb6d511a9a6c770329f5e194538097 270143: 751ef2c060e58b96ed71f39c546c010197c44b7a 270079: 70f0da57566d8381ecb91ed74bfd05935eb00cfe v: v3 --- [refs] | 2 +- trunk/arch/arm/Kconfig | 1 + .../arm/mach-s5pc100/include/mach/memory.h | 18 ------------------ 3 files changed, 2 insertions(+), 19 deletions(-) delete mode 100644 trunk/arch/arm/mach-s5pc100/include/mach/memory.h diff --git a/[refs] b/[refs] index 4c4ceb654dd1..c134d615590e 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: f8bc5ddf139e05b21a768bc837d48f3db61c0d96 +refs/heads/master: 476eb37ad799e9ed5f540a08485359258ce95549 diff --git a/trunk/arch/arm/Kconfig b/trunk/arch/arm/Kconfig index 549e77a05e9a..09da28b66a87 100644 --- a/trunk/arch/arm/Kconfig +++ b/trunk/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/trunk/arch/arm/mach-s5pc100/include/mach/memory.h b/trunk/arch/arm/mach-s5pc100/include/mach/memory.h deleted file mode 100644 index bda4e79fd5fc..000000000000 --- a/trunk/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 - * - * 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