From d9cda0d99c11b8b57205b3cf9b29b74001713bf5 Mon Sep 17 00:00:00 2001 From: Nicolas Pitre Date: Tue, 5 Jul 2011 22:52:51 -0400 Subject: [PATCH] --- yaml --- r: 270181 b: refs/heads/master c: e33e51070cbe8979a9aac43a6d5e773eaa44f9b1 h: refs/heads/master i: 270179: 8167616bb91b8776cf4a90186c8bff9ed06f974b v: v3 --- [refs] | 2 +- trunk/arch/arm/Kconfig | 1 + trunk/arch/arm/mach-dove/include/mach/memory.h | 10 ---------- 3 files changed, 2 insertions(+), 11 deletions(-) delete mode 100644 trunk/arch/arm/mach-dove/include/mach/memory.h diff --git a/[refs] b/[refs] index 21cdf5ff5163..1b6f6173732a 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 1b9f95f8ade9efc2bd49f0e7b9dc61a038ac3eef +refs/heads/master: e33e51070cbe8979a9aac43a6d5e773eaa44f9b1 diff --git a/trunk/arch/arm/Kconfig b/trunk/arch/arm/Kconfig index 1ecb09bca27e..646cc4becb69 100644 --- a/trunk/arch/arm/Kconfig +++ b/trunk/arch/arm/Kconfig @@ -503,6 +503,7 @@ config ARCH_DOVE select ARCH_REQUIRE_GPIOLIB select GENERIC_CLOCKEVENTS select PLAT_ORION + select NO_MACH_MEMORY_H help Support for the Marvell Dove SoC 88AP510 diff --git a/trunk/arch/arm/mach-dove/include/mach/memory.h b/trunk/arch/arm/mach-dove/include/mach/memory.h deleted file mode 100644 index bbc93fee6c75..000000000000 --- a/trunk/arch/arm/mach-dove/include/mach/memory.h +++ /dev/null @@ -1,10 +0,0 @@ -/* - * arch/arm/mach-dove/include/mach/memory.h - */ - -#ifndef __ASM_ARCH_MEMORY_H -#define __ASM_ARCH_MEMORY_H - -#define PLAT_PHYS_OFFSET UL(0x00000000) - -#endif