From f41c9f1d9024db5b4e729f0f97b1e15b69a1b89e Mon Sep 17 00:00:00 2001 From: Nicolas Pitre Date: Tue, 5 Jul 2011 22:52:51 -0400 Subject: [PATCH] --- yaml --- r: 270182 b: refs/heads/master c: 748e91cb3c6040a73b63afc348fe3d6042bdeef3 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/arch/arm/Kconfig | 1 + trunk/arch/arm/mach-kirkwood/include/mach/memory.h | 10 ---------- 3 files changed, 2 insertions(+), 11 deletions(-) delete mode 100644 trunk/arch/arm/mach-kirkwood/include/mach/memory.h diff --git a/[refs] b/[refs] index 1b6f6173732a..0e2b3147db78 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: e33e51070cbe8979a9aac43a6d5e773eaa44f9b1 +refs/heads/master: 748e91cb3c6040a73b63afc348fe3d6042bdeef3 diff --git a/trunk/arch/arm/Kconfig b/trunk/arch/arm/Kconfig index 646cc4becb69..b2235184e7b6 100644 --- a/trunk/arch/arm/Kconfig +++ b/trunk/arch/arm/Kconfig @@ -514,6 +514,7 @@ config ARCH_KIRKWOOD select ARCH_REQUIRE_GPIOLIB select GENERIC_CLOCKEVENTS select PLAT_ORION + select NO_MACH_MEMORY_H help Support for the following Marvell Kirkwood series SoCs: 88F6180, 88F6192 and 88F6281. diff --git a/trunk/arch/arm/mach-kirkwood/include/mach/memory.h b/trunk/arch/arm/mach-kirkwood/include/mach/memory.h deleted file mode 100644 index 4600b44e3ad3..000000000000 --- a/trunk/arch/arm/mach-kirkwood/include/mach/memory.h +++ /dev/null @@ -1,10 +0,0 @@ -/* - * arch/arm/mach-kirkwood/include/mach/memory.h - */ - -#ifndef __ASM_ARCH_MEMORY_H -#define __ASM_ARCH_MEMORY_H - -#define PLAT_PHYS_OFFSET UL(0x00000000) - -#endif