---

yaml --- r: 270206 b: refs/heads/master c: f8bc5dd h: refs/heads/master v: v3
git-mirror · Oct 13, 2011 · 086da3e · 086da3e
1 parent a3f06f3
commit 086da3e
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 29 deletions.
diff --git 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
@@ -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