diff options
-rw-r--r-- | arch/arm/Kconfig | 1 | ||||
-rw-r--r-- | arch/arm/mach-tegra/include/mach/memory.h | 28 |
2 files changed, 1 insertions, 28 deletions
diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig index 49badb13be45..549e77a05e9a 100644 --- a/arch/arm/Kconfig +++ b/arch/arm/Kconfig | |||
@@ -627,6 +627,7 @@ config ARCH_TEGRA | |||
627 | select HAVE_CLK | 627 | select HAVE_CLK |
628 | select HAVE_SCHED_CLOCK | 628 | select HAVE_SCHED_CLOCK |
629 | select ARCH_HAS_CPUFREQ | 629 | select ARCH_HAS_CPUFREQ |
630 | select NO_MACH_MEMORY_H | ||
630 | help | 631 | help |
631 | This enables support for NVIDIA Tegra based systems (Tegra APX, | 632 | This enables support for NVIDIA Tegra based systems (Tegra APX, |
632 | Tegra 6xx and Tegra 2 series). | 633 | Tegra 6xx and Tegra 2 series). |
diff --git a/arch/arm/mach-tegra/include/mach/memory.h b/arch/arm/mach-tegra/include/mach/memory.h deleted file mode 100644 index 537db3aa81a7..000000000000 --- a/arch/arm/mach-tegra/include/mach/memory.h +++ /dev/null | |||
@@ -1,28 +0,0 @@ | |||
1 | /* | ||
2 | * arch/arm/mach-tegra/include/mach/memory.h | ||
3 | * | ||
4 | * Copyright (C) 2010 Google, Inc. | ||
5 | * | ||
6 | * Author: | ||
7 | * Colin Cross <ccross@google.com> | ||
8 | * Erik Gilling <konkers@google.com> | ||
9 | * | ||
10 | * This software is licensed under the terms of the GNU General Public | ||
11 | * License version 2, as published by the Free Software Foundation, and | ||
12 | * may be copied, distributed, and modified under those terms. | ||
13 | * | ||
14 | * This program is distributed in the hope that it will be useful, | ||
15 | * but WITHOUT ANY WARRANTY; without even the implied warranty of | ||
16 | * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | ||
17 | * GNU General Public License for more details. | ||
18 | * | ||
19 | */ | ||
20 | |||
21 | #ifndef __MACH_TEGRA_MEMORY_H | ||
22 | #define __MACH_TEGRA_MEMORY_H | ||
23 | |||
24 | /* physical offset of RAM */ | ||
25 | #define PLAT_PHYS_OFFSET UL(0) | ||
26 | |||
27 | #endif | ||
28 | |||