diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2012-01-06 18:09:14 -0500 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2012-01-06 18:09:14 -0500 |
| commit | e067096c8d57d191f29d734cd5692695c95cc36e (patch) | |
| tree | e1c200404c3ed3730d04837113d59ca898eb483a /arch/arm/mach-tegra/board-harmony.c | |
| parent | 1fc3eb81100c3f3cd44e706e54390151b0f1ce74 (diff) | |
| parent | e5570bbc9c06634cfac94e06ac1432b53d8595e5 (diff) | |
Merge branch 'tegra/soc' into next/boards
Conflicts:
arch/arm/mach-tegra/board-harmony-pcie.c
To fix an internal merge conflict between the tegra/soc and tegra/boards
branches.
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Diffstat (limited to 'arch/arm/mach-tegra/board-harmony.c')
| -rw-r--r-- | arch/arm/mach-tegra/board-harmony.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/mach-tegra/board-harmony.c b/arch/arm/mach-tegra/board-harmony.c index fd190a8dc665..d60a0d45f2f7 100644 --- a/arch/arm/mach-tegra/board-harmony.c +++ b/arch/arm/mach-tegra/board-harmony.c | |||
| @@ -186,7 +186,7 @@ MACHINE_START(HARMONY, "harmony") | |||
| 186 | .atag_offset = 0x100, | 186 | .atag_offset = 0x100, |
| 187 | .fixup = tegra_harmony_fixup, | 187 | .fixup = tegra_harmony_fixup, |
| 188 | .map_io = tegra_map_common_io, | 188 | .map_io = tegra_map_common_io, |
| 189 | .init_early = tegra_init_early, | 189 | .init_early = tegra20_init_early, |
| 190 | .init_irq = tegra_init_irq, | 190 | .init_irq = tegra_init_irq, |
| 191 | .handle_irq = gic_handle_irq, | 191 | .handle_irq = gic_handle_irq, |
| 192 | .timer = &tegra_timer, | 192 | .timer = &tegra_timer, |