From 1ef320dafbd089813b0bb15fd1005ae15340ff7f Mon Sep 17 00:00:00 2001 From: Nicolas Pitre Date: Tue, 5 Jul 2011 22:52:53 -0400 Subject: [PATCH] --- yaml --- r: 270190 b: refs/heads/master c: f29781ac69c913272acf915c4d3aacc44af5ddfc h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/arch/arm/Kconfig | 1 + .../arm/mach-w90x900/include/mach/memory.h | 23 ------------------- 3 files changed, 2 insertions(+), 24 deletions(-) delete mode 100644 trunk/arch/arm/mach-w90x900/include/mach/memory.h diff --git a/[refs] b/[refs] index 19235269e1a5..f692f934eac5 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 34561b557ff0a3ee0c4bdaf5a5198246e41826e4 +refs/heads/master: f29781ac69c913272acf915c4d3aacc44af5ddfc diff --git a/trunk/arch/arm/Kconfig b/trunk/arch/arm/Kconfig index 47a04e59e614..ecc18d51f332 100644 --- a/trunk/arch/arm/Kconfig +++ b/trunk/arch/arm/Kconfig @@ -590,6 +590,7 @@ config ARCH_W90X900 select CLKDEV_LOOKUP select CLKSRC_MMIO select GENERIC_CLOCKEVENTS + select NO_MACH_MEMORY_H help Support for Nuvoton (Winbond logic dept.) ARM9 processor, At present, the w90x900 has been renamed nuc900, regarding diff --git a/trunk/arch/arm/mach-w90x900/include/mach/memory.h b/trunk/arch/arm/mach-w90x900/include/mach/memory.h deleted file mode 100644 index f02905ba7746..000000000000 --- a/trunk/arch/arm/mach-w90x900/include/mach/memory.h +++ /dev/null @@ -1,23 +0,0 @@ -/* - * arch/arm/mach-w90x900/include/mach/memory.h - * - * Copyright (c) 2008 Nuvoton technology corporation - * All rights reserved. - * - * Wan ZongShun - * - * Based on arch/arm/mach-s3c2410/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 as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. - * - */ - -#ifndef __ASM_ARCH_MEMORY_H -#define __ASM_ARCH_MEMORY_H - -#define PLAT_PHYS_OFFSET UL(0x00000000) - -#endif