From 97a1a2f2a334d47d9fe0e1b5b36234f8b5fad1c7 Mon Sep 17 00:00:00 2001 From: Nicolas Pitre Date: Tue, 5 Jul 2011 22:52:55 -0400 Subject: [PATCH] --- yaml --- r: 270202 b: refs/heads/master c: 6b1f1005f3dbc6fe52c68c2fccb525a0ebcc9afa h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/arch/arm/Kconfig | 1 + .../arm/mach-nuc93x/include/mach/memory.h | 21 ------------------- 3 files changed, 2 insertions(+), 22 deletions(-) delete mode 100644 trunk/arch/arm/mach-nuc93x/include/mach/memory.h diff --git a/[refs] b/[refs] index 6d04e9b81422..9ca05e4e6292 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: a109d811bab30d44ee775a9f15348add7014180c +refs/heads/master: 6b1f1005f3dbc6fe52c68c2fccb525a0ebcc9afa diff --git a/trunk/arch/arm/Kconfig b/trunk/arch/arm/Kconfig index cb4ac95297b4..44a2ad7c4c25 100644 --- a/trunk/arch/arm/Kconfig +++ b/trunk/arch/arm/Kconfig @@ -610,6 +610,7 @@ config ARCH_NUC93X bool "Nuvoton NUC93X CPU" select CPU_ARM926T select CLKDEV_LOOKUP + select NO_MACH_MEMORY_H help Support for Nuvoton (Winbond logic dept.) NUC93X MCU,The NUC93X is a low-power and high performance MPEG-4/JPEG multimedia controller chip. diff --git a/trunk/arch/arm/mach-nuc93x/include/mach/memory.h b/trunk/arch/arm/mach-nuc93x/include/mach/memory.h deleted file mode 100644 index ef9864b002a6..000000000000 --- a/trunk/arch/arm/mach-nuc93x/include/mach/memory.h +++ /dev/null @@ -1,21 +0,0 @@ -/* - * arch/arm/mach-nuc93x/include/mach/memory.h - * - * Copyright (c) 2008 Nuvoton technology corporation - * All rights reserved. - * - * Wan ZongShun - * - * 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