From 799ce351ae0aa230aa3dc2eddfb0d23202fe9e0d Mon Sep 17 00:00:00 2001 From: Nicolas Pitre Date: Tue, 5 Jul 2011 22:52:54 -0400 Subject: [PATCH] --- yaml --- r: 270198 b: refs/heads/master c: d8c9e024e300cc3dfccf96050368880ef1669426 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/arch/arm/Kconfig | 1 + .../arm/mach-gemini/include/mach/memory.h | 19 ------------------- 3 files changed, 2 insertions(+), 20 deletions(-) delete mode 100644 trunk/arch/arm/mach-gemini/include/mach/memory.h diff --git a/[refs] b/[refs] index ab1e31e6efb0..c8b86f8b77cd 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: bf45bd7687637c8731258b185fcff0c3deb3032f +refs/heads/master: d8c9e024e300cc3dfccf96050368880ef1669426 diff --git a/trunk/arch/arm/Kconfig b/trunk/arch/arm/Kconfig index 3c2e0b50ff18..4633cb919b83 100644 --- a/trunk/arch/arm/Kconfig +++ b/trunk/arch/arm/Kconfig @@ -349,6 +349,7 @@ config ARCH_GEMINI select CPU_FA526 select ARCH_REQUIRE_GPIOLIB select ARCH_USES_GETTIMEOFFSET + select NO_MACH_MEMORY_H help Support for the Cortina Systems Gemini family SoCs diff --git a/trunk/arch/arm/mach-gemini/include/mach/memory.h b/trunk/arch/arm/mach-gemini/include/mach/memory.h deleted file mode 100644 index a50915f764d8..000000000000 --- a/trunk/arch/arm/mach-gemini/include/mach/memory.h +++ /dev/null @@ -1,19 +0,0 @@ -/* - * Copyright (C) 2001-2006 Storlink, Corp. - * Copyright (C) 2008-2009 Paulius Zaleckas - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. - */ -#ifndef __MACH_MEMORY_H -#define __MACH_MEMORY_H - -#ifdef CONFIG_GEMINI_MEM_SWAP -# define PLAT_PHYS_OFFSET UL(0x00000000) -#else -# define PLAT_PHYS_OFFSET UL(0x10000000) -#endif - -#endif /* __MACH_MEMORY_H */