From a3f06f382155c5aa32bc264b18222c9f1b2b8a8c Mon Sep 17 00:00:00 2001 From: Nicolas Pitre Date: Tue, 5 Jul 2011 22:52:55 -0400 Subject: [PATCH] --- yaml --- r: 270205 b: refs/heads/master c: 3044454779b1e8ffb536b79ffbbbfc731fc84fdf h: refs/heads/master i: 270203: e87c20148baf4c5bac07cf8323e68d507adde987 v: v3 --- [refs] | 2 +- trunk/arch/arm/Kconfig | 1 + trunk/arch/arm/plat-tcc/include/mach/memory.h | 18 ------------------ 3 files changed, 2 insertions(+), 19 deletions(-) delete mode 100644 trunk/arch/arm/plat-tcc/include/mach/memory.h diff --git a/[refs] b/[refs] index 397a2490e555..79dd1ec6371a 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 9b15e4fe00a136471d4ad22debcb0b270401cefc +refs/heads/master: 3044454779b1e8ffb536b79ffbbbfc731fc84fdf diff --git a/trunk/arch/arm/Kconfig b/trunk/arch/arm/Kconfig index 6e277c4487d8..49badb13be45 100644 --- a/trunk/arch/arm/Kconfig +++ b/trunk/arch/arm/Kconfig @@ -845,6 +845,7 @@ config ARCH_TCC_926 select HAVE_CLK select CLKDEV_LOOKUP select GENERIC_CLOCKEVENTS + select NO_MACH_MEMORY_H help Support for Telechips TCC ARM926-based systems. diff --git a/trunk/arch/arm/plat-tcc/include/mach/memory.h b/trunk/arch/arm/plat-tcc/include/mach/memory.h deleted file mode 100644 index 28a6e0cd13b3..000000000000 --- a/trunk/arch/arm/plat-tcc/include/mach/memory.h +++ /dev/null @@ -1,18 +0,0 @@ -/* - * Copyright (C) 1999 ARM Limited - * Copyright (C) 2000 RidgeRun, Inc. - * Copyright (C) 2008-2009 Telechips - * Copyright (C) 2010 Hans J. Koch - * - * Licensed under the terms of the GPL v2. - */ - -#ifndef __ASM_ARCH_MEMORY_H -#define __ASM_ARCH_MEMORY_H - -/* - * Physical DRAM offset. - */ -#define PLAT_PHYS_OFFSET UL(0x20000000) - -#endif