From 530f800ebc926d091fafa01b2990da6400fe99fc Mon Sep 17 00:00:00 2001 From: Nicolas Pitre Date: Tue, 5 Jul 2011 22:52:54 -0400 Subject: [PATCH] --- yaml --- r: 270195 b: refs/heads/master c: 2f93c8885bdb18e365e087badc076e7514b8a951 h: refs/heads/master i: 270193: d6d5099499cecfdf66539ebf6dd08c2515a64419 270191: 78cbd4642d7cdb067f968024b10d1412e8b53ac6 v: v3 --- [refs] | 2 +- trunk/arch/arm/Kconfig | 1 + .../arm/mach-versatile/include/mach/memory.h | 28 ------------------- 3 files changed, 2 insertions(+), 29 deletions(-) delete mode 100644 trunk/arch/arm/mach-versatile/include/mach/memory.h diff --git a/[refs] b/[refs] index a90b999acf84..f49a5cee8e03 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 6d3f8b40f4b6b832491617be510970157264513a +refs/heads/master: 2f93c8885bdb18e365e087badc076e7514b8a951 diff --git a/trunk/arch/arm/Kconfig b/trunk/arch/arm/Kconfig index 96531afb8fb7..755f2c366fd8 100644 --- a/trunk/arch/arm/Kconfig +++ b/trunk/arch/arm/Kconfig @@ -285,6 +285,7 @@ config ARCH_VERSATILE select PLAT_VERSATILE_CLCD select PLAT_VERSATILE_FPGA_IRQ select ARM_TIMER_SP804 + select NO_MACH_MEMORY_H help This enables support for ARM Ltd Versatile board. diff --git a/trunk/arch/arm/mach-versatile/include/mach/memory.h b/trunk/arch/arm/mach-versatile/include/mach/memory.h deleted file mode 100644 index dacc9d8e4e6a..000000000000 --- a/trunk/arch/arm/mach-versatile/include/mach/memory.h +++ /dev/null @@ -1,28 +0,0 @@ -/* - * arch/arm/mach-versatile/include/mach/memory.h - * - * Copyright (C) 2003 ARM Limited - * - * 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. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - */ -#ifndef __ASM_ARCH_MEMORY_H -#define __ASM_ARCH_MEMORY_H - -/* - * Physical DRAM offset. - */ -#define PLAT_PHYS_OFFSET UL(0x00000000) - -#endif