From b041f07f4ae416cf31da7b0ab4df5df544e3d69f Mon Sep 17 00:00:00 2001 From: Nicolas Pitre Date: Tue, 5 Jul 2011 22:52:55 -0400 Subject: [PATCH] --- yaml --- r: 270204 b: refs/heads/master c: 9b15e4fe00a136471d4ad22debcb0b270401cefc h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/arch/arm/Kconfig | 1 + trunk/arch/arm/mach-mmp/include/mach/memory.h | 14 -------------- 3 files changed, 2 insertions(+), 15 deletions(-) delete mode 100644 trunk/arch/arm/mach-mmp/include/mach/memory.h diff --git a/[refs] b/[refs] index 658d5d265e85..397a2490e555 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 17108711c556b44c1d805bbb3f3ac81011c5dd6a +refs/heads/master: 9b15e4fe00a136471d4ad22debcb0b270401cefc diff --git a/trunk/arch/arm/Kconfig b/trunk/arch/arm/Kconfig index 560cc11af7a0..6e277c4487d8 100644 --- a/trunk/arch/arm/Kconfig +++ b/trunk/arch/arm/Kconfig @@ -578,6 +578,7 @@ config ARCH_MMP select TICK_ONESHOT select PLAT_PXA select SPARSE_IRQ + select NO_MACH_MEMORY_H help Support for Marvell's PXA168/PXA910(MMP) and MMP2 processor line. diff --git a/trunk/arch/arm/mach-mmp/include/mach/memory.h b/trunk/arch/arm/mach-mmp/include/mach/memory.h deleted file mode 100644 index d68b50a2d6a0..000000000000 --- a/trunk/arch/arm/mach-mmp/include/mach/memory.h +++ /dev/null @@ -1,14 +0,0 @@ -/* - * linux/arch/arm/mach-mmp/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 version 2 as - * published by the Free Software Foundation. - */ - -#ifndef __ASM_MACH_MEMORY_H -#define __ASM_MACH_MEMORY_H - -#define PLAT_PHYS_OFFSET UL(0x00000000) - -#endif /* __ASM_MACH_MEMORY_H */