diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2012-01-07 15:53:13 -0500 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2012-01-07 15:53:13 -0500 |
| commit | 23c4c1c7b0dd2ebeb90bb6851478c0e80fe9e6b8 (patch) | |
| tree | 60ab5e96f1e6e0ddd46eadf34d8a83ae2d8db72a /arch/arm/mach-tegra/board-dt-tegra20.c | |
| parent | e195ffbe4573f79d590e63e2ae32dac2a73d5768 (diff) | |
| parent | 7b9dd47136c07ffd883aff6926c7b281e4c1eea4 (diff) | |
Merge branch 'depends/rmk/for-linus' into next/soc
Conflicts:
arch/arm/mach-tegra/board-dt-tegra20.c
arch/arm/mach-tegra/common.c
Diffstat (limited to 'arch/arm/mach-tegra/board-dt-tegra20.c')
| -rw-r--r-- | arch/arm/mach-tegra/board-dt-tegra20.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/arm/mach-tegra/board-dt-tegra20.c b/arch/arm/mach-tegra/board-dt-tegra20.c index d1befbedbdea..47e1fa322f15 100644 --- a/arch/arm/mach-tegra/board-dt-tegra20.c +++ b/arch/arm/mach-tegra/board-dt-tegra20.c | |||
| @@ -144,5 +144,6 @@ DT_MACHINE_START(TEGRA_DT, "nVidia Tegra20 (Flattened Device Tree)") | |||
| 144 | .handle_irq = gic_handle_irq, | 144 | .handle_irq = gic_handle_irq, |
| 145 | .timer = &tegra_timer, | 145 | .timer = &tegra_timer, |
| 146 | .init_machine = tegra_dt_init, | 146 | .init_machine = tegra_dt_init, |
| 147 | .restart = tegra_assert_system_reset, | ||
| 147 | .dt_compat = tegra20_dt_board_compat, | 148 | .dt_compat = tegra20_dt_board_compat, |
| 148 | MACHINE_END | 149 | MACHINE_END |