From 3afd881250d3e29baeb6b8e9d68c17b58b323119 Mon Sep 17 00:00:00 2001 From: Nicolas Pitre Date: Fri, 2 Sep 2011 21:48:28 -0400 Subject: [PATCH] --- yaml --- r: 270217 b: refs/heads/master c: b4be3999d1895c9697580574ca4ea52d84bc4ddd h: refs/heads/master i: 270215: 064660a962fc8989e54a3bf2029b5c2ac85fc69d v: v3 --- [refs] | 2 +- trunk/arch/arm/Kconfig | 1 + .../arm/mach-s3c64xx/include/mach/memory.h | 18 ------------------ 3 files changed, 2 insertions(+), 19 deletions(-) delete mode 100644 trunk/arch/arm/mach-s3c64xx/include/mach/memory.h diff --git a/[refs] b/[refs] index a6813bad0a52..77f28cc585c9 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: c039bad00f21a025df6fcb238578023c2cc881bf +refs/heads/master: b4be3999d1895c9697580574ca4ea52d84bc4ddd diff --git a/trunk/arch/arm/Kconfig b/trunk/arch/arm/Kconfig index 408d413826cb..a87deac9f768 100644 --- a/trunk/arch/arm/Kconfig +++ b/trunk/arch/arm/Kconfig @@ -765,6 +765,7 @@ config ARCH_S3C64XX select SAMSUNG_GPIOLIB_4BIT select HAVE_S3C2410_I2C if I2C select HAVE_S3C2410_WATCHDOG if WATCHDOG + select NO_MACH_MEMORY_H help Samsung S3C64XX series based systems diff --git a/trunk/arch/arm/mach-s3c64xx/include/mach/memory.h b/trunk/arch/arm/mach-s3c64xx/include/mach/memory.h deleted file mode 100644 index b704669f95ff..000000000000 --- a/trunk/arch/arm/mach-s3c64xx/include/mach/memory.h +++ /dev/null @@ -1,18 +0,0 @@ -/* arch/arm/mach-s3c6400/include/mach/memory.h - * - * Copyright 2008 Openmoko, Inc. - * Copyright 2008 Simtec Electronics - * Ben Dooks - * http://armlinux.simtec.co.uk/ - * - * 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(0x50000000) - -#endif