diff options
| author | Varun Wadekar <vwadekar@nvidia.com> | 2012-06-21 10:57:37 +0530 |
|---|---|---|
| committer | Varun Wadekar <vwadekar@nvidia.com> | 2012-06-21 11:08:20 +0530 |
| commit | 437cbb59ef20b7bb2d319db1ab5ba8a1cd38080c (patch) | |
| tree | c8a9aafec200e89a4d11219b5c7319117b75224c /arch/arm/mach-tegra/board-harmony.c | |
| parent | adf8e216a6072cf4b1a4bb3fe4a3e047a16a3303 (diff) | |
| parent | b6f188611659d167b6284d43116b9b2ea542cacf (diff) | |
Merge remote-tracking branch 'maz/soc_desc-v3.3-rc4' into android-t114-3.4-rebased
Conflicts:
arch/arm/kernel/setup.c
arch/arm/mach-exynos/common.c
arch/arm/mach-exynos/common.h
arch/arm/mach-imx/mach-imx6q.c
arch/arm/mach-omap2/omap-hotplug.c
arch/arm/mach-omap2/omap-smp.c
arch/arm/mach-realview/core.c
arch/arm/mach-shmobile/board-ag5evm.c
arch/arm/mach-shmobile/board-kota2.c
arch/arm/mach-shmobile/board-marzen.c
arch/arm/mach-shmobile/include/mach/common.h
arch/arm/mach-shmobile/platsmp.c
arch/arm/mach-tegra/board-harmony.c
arch/arm/mach-tegra/common.c
arch/arm/mach-tegra/hotplug.c
arch/arm/mach-tegra/platsmp.c
arch/arm/mach-ux500/cpu.c
arch/arm/mach-vexpress/core.h
Change-Id: I3e0cfcfd1d187d8f1def41a1a5df1f5eedc5519f
Signed-off-by: Varun Wadekar <vwadekar@nvidia.com>
Diffstat (limited to 'arch/arm/mach-tegra/board-harmony.c')
| -rw-r--r-- | arch/arm/mach-tegra/board-harmony.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/arch/arm/mach-tegra/board-harmony.c b/arch/arm/mach-tegra/board-harmony.c index b254347ce87c..678b9109005b 100644 --- a/arch/arm/mach-tegra/board-harmony.c +++ b/arch/arm/mach-tegra/board-harmony.c @@ -59,6 +59,7 @@ #include "devices.h" #include "gpio-names.h" #include "pm.h" +#include "common.h" /* NVidia bootloader tags */ #define ATAG_NVIDIA 0x41000801 @@ -508,6 +509,7 @@ void __init tegra_harmony_reserve(void) MACHINE_START(HARMONY, "harmony") .atag_offset = 0x100, + .soc = &tegra_soc_desc, .fixup = tegra_harmony_fixup, .map_io = tegra_map_common_io, .reserve = tegra_harmony_reserve, |