diff options
| author | H. Peter Anvin <hpa@zytor.com> | 2012-05-30 15:11:26 -0400 |
|---|---|---|
| committer | H. Peter Anvin <hpa@zytor.com> | 2012-05-30 15:11:32 -0400 |
| commit | bbd771474ec44b516107685d77e1c80bbe09f141 (patch) | |
| tree | 0cb15781539a68f27b4ea6c89f827282630cbce6 /arch/arm/mach-tegra/board-harmony.c | |
| parent | 403e1c5b7495d7b80fae9fc4d0a7a6f5abdc3307 (diff) | |
| parent | 319b6ffc6df892e4ccffff823cc5521a4a5d2dca (diff) | |
Merge branch 'x86/trampoline' into x86/urgent
x86/trampoline contains an urgent commit which is necessarily on a
newer baseline.
Signed-off-by: H. Peter Anvin <hpa@zytor.com>
Diffstat (limited to 'arch/arm/mach-tegra/board-harmony.c')
| -rw-r--r-- | arch/arm/mach-tegra/board-harmony.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/arm/mach-tegra/board-harmony.c b/arch/arm/mach-tegra/board-harmony.c index b906b3b6077b..e65e837f4013 100644 --- a/arch/arm/mach-tegra/board-harmony.c +++ b/arch/arm/mach-tegra/board-harmony.c | |||
| @@ -192,5 +192,6 @@ MACHINE_START(HARMONY, "harmony") | |||
| 192 | .handle_irq = gic_handle_irq, | 192 | .handle_irq = gic_handle_irq, |
| 193 | .timer = &tegra_timer, | 193 | .timer = &tegra_timer, |
| 194 | .init_machine = tegra_harmony_init, | 194 | .init_machine = tegra_harmony_init, |
| 195 | .init_late = tegra_init_late, | ||
| 195 | .restart = tegra_assert_system_reset, | 196 | .restart = tegra_assert_system_reset, |
| 196 | MACHINE_END | 197 | MACHINE_END |