From 086da3e05cd516e63b650f2247e20dedbebc066e Mon Sep 17 00:00:00 2001 From: Nicolas Pitre Date: Tue, 5 Jul 2011 22:52:55 -0400 Subject: [PATCH] --- yaml --- r: 270206 b: refs/heads/master c: f8bc5ddf139e05b21a768bc837d48f3db61c0d96 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/arch/arm/Kconfig | 1 + .../arch/arm/mach-tegra/include/mach/memory.h | 28 ------------------- 3 files changed, 2 insertions(+), 29 deletions(-) delete mode 100644 trunk/arch/arm/mach-tegra/include/mach/memory.h diff --git a/[refs] b/[refs] index 79dd1ec6371a..4c4ceb654dd1 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 3044454779b1e8ffb536b79ffbbbfc731fc84fdf +refs/heads/master: f8bc5ddf139e05b21a768bc837d48f3db61c0d96 diff --git a/trunk/arch/arm/Kconfig b/trunk/arch/arm/Kconfig index 49badb13be45..549e77a05e9a 100644 --- a/trunk/arch/arm/Kconfig +++ b/trunk/arch/arm/Kconfig @@ -627,6 +627,7 @@ config ARCH_TEGRA select HAVE_CLK select HAVE_SCHED_CLOCK select ARCH_HAS_CPUFREQ + select NO_MACH_MEMORY_H help This enables support for NVIDIA Tegra based systems (Tegra APX, Tegra 6xx and Tegra 2 series). diff --git a/trunk/arch/arm/mach-tegra/include/mach/memory.h b/trunk/arch/arm/mach-tegra/include/mach/memory.h deleted file mode 100644 index 537db3aa81a7..000000000000 --- a/trunk/arch/arm/mach-tegra/include/mach/memory.h +++ /dev/null @@ -1,28 +0,0 @@ -/* - * arch/arm/mach-tegra/include/mach/memory.h - * - * Copyright (C) 2010 Google, Inc. - * - * Author: - * Colin Cross - * Erik Gilling - * - * This software is licensed under the terms of the GNU General Public - * License version 2, as published by the Free Software Foundation, and - * may be copied, distributed, and modified under those terms. - * - * 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. - * - */ - -#ifndef __MACH_TEGRA_MEMORY_H -#define __MACH_TEGRA_MEMORY_H - -/* physical offset of RAM */ -#define PLAT_PHYS_OFFSET UL(0) - -#endif -