From d7dcf42848046fba979cd48b51b9e247abbd03bd Mon Sep 17 00:00:00 2001 From: Nicolas Pitre Date: Tue, 5 Jul 2011 22:52:53 -0400 Subject: [PATCH] --- yaml --- r: 270187 b: refs/heads/master c: 8b5da2df272d5aaceb17addae8afc068b447aa51 h: refs/heads/master i: 270185: 2a4a81a7601887ba30a6f836bcf5b01f519fefa9 270183: f262585a95fc06af0ec6219ab1beb4e55f99ba79 v: v3 --- [refs] | 2 +- trunk/arch/arm/Kconfig | 1 + .../arm/mach-s3c2400/include/mach/memory.h | 20 ------------------- .../arm/mach-s3c2410/include/mach/memory.h | 16 --------------- 4 files changed, 2 insertions(+), 37 deletions(-) delete mode 100644 trunk/arch/arm/mach-s3c2400/include/mach/memory.h delete mode 100644 trunk/arch/arm/mach-s3c2410/include/mach/memory.h diff --git a/[refs] b/[refs] index 35d18831dd7d..5708890ee295 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 8cfc1ef96a873d35d2fb86ac8ccf34d388a48e55 +refs/heads/master: 8b5da2df272d5aaceb17addae8afc068b447aa51 diff --git a/trunk/arch/arm/Kconfig b/trunk/arch/arm/Kconfig index 01343438e91b..3776fccd923f 100644 --- a/trunk/arch/arm/Kconfig +++ b/trunk/arch/arm/Kconfig @@ -711,6 +711,7 @@ config ARCH_S3C2410 select CLKDEV_LOOKUP select ARCH_USES_GETTIMEOFFSET select HAVE_S3C2410_I2C if I2C + select NO_MACH_MEMORY_H help Samsung S3C2410X CPU based systems, such as the Simtec Electronics BAST (), the IPAQ 1940 or diff --git a/trunk/arch/arm/mach-s3c2400/include/mach/memory.h b/trunk/arch/arm/mach-s3c2400/include/mach/memory.h deleted file mode 100644 index 3f33670dd012..000000000000 --- a/trunk/arch/arm/mach-s3c2400/include/mach/memory.h +++ /dev/null @@ -1,20 +0,0 @@ -/* arch/arm/mach-s3c2400/include/mach/memory.h - * from arch/arm/mach-rpc/include/mach/memory.h - * - * Copyright 2007 Simtec Electronics - * http://armlinux.simtec.co.uk/ - * Ben Dooks - * - * Copyright (C) 1996,1997,1998 Russell King. - * - * 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(0x0C000000) - -#endif diff --git a/trunk/arch/arm/mach-s3c2410/include/mach/memory.h b/trunk/arch/arm/mach-s3c2410/include/mach/memory.h deleted file mode 100644 index f92b97b89c0c..000000000000 --- a/trunk/arch/arm/mach-s3c2410/include/mach/memory.h +++ /dev/null @@ -1,16 +0,0 @@ -/* arch/arm/mach-s3c2410/include/mach/memory.h - * from arch/arm/mach-rpc/include/mach/memory.h - * - * Copyright (C) 1996,1997,1998 Russell King. - * - * 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(0x30000000) - -#endif