diff options
| author | Olof Johansson <olof@lixom.net> | 2013-02-09 17:52:44 -0800 |
|---|---|---|
| committer | Olof Johansson <olof@lixom.net> | 2013-02-09 17:53:02 -0800 |
| commit | f58cf70ed954c179825cd0c51f5f64cd1ed74ed3 (patch) | |
| tree | f46e6fd10e45bd7d4e25c6ba93f145e281b9f557 /arch/arm/mach-tegra/board-dt-tegra114.c | |
| parent | e2efc25ac21ff3c8ead9670dffba40926aa54ad7 (diff) | |
| parent | 1d7e5c2c815dda6eb7a0e41a6b27ea61cd927f99 (diff) | |
Merge branch 'tegra/t114' into next/soc
Add a couple of fixes sent via email (via Stephen/Hiroshi).
* tegra/t114:
ARM: tegra: sort Kconfig selects for Tegra114
ARM: tegra: enable ARCH_REQUIRE_GPIOLIB for Tegra114
ARM: tegra: Fix build error w/ ARCH_TEGRA_114_SOC w/o ARCH_TEGRA_3x_SOC
Signed-off-by: Olof Johansson <olof@lixom.net>
Diffstat (limited to 'arch/arm/mach-tegra/board-dt-tegra114.c')
| -rw-r--r-- | arch/arm/mach-tegra/board-dt-tegra114.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/mach-tegra/board-dt-tegra114.c b/arch/arm/mach-tegra/board-dt-tegra114.c index 72598e298667..085d63637b62 100644 --- a/arch/arm/mach-tegra/board-dt-tegra114.c +++ b/arch/arm/mach-tegra/board-dt-tegra114.c @@ -36,7 +36,7 @@ static const char * const tegra114_dt_board_compat[] = { DT_MACHINE_START(TEGRA114_DT, "NVIDIA Tegra114 (Flattened Device Tree)") .smp = smp_ops(tegra_smp_ops), .map_io = tegra_map_common_io, - .init_early = tegra30_init_early, + .init_early = tegra114_init_early, .init_irq = tegra_dt_init_irq, .init_time = clocksource_of_init, .init_machine = tegra114_dt_init, |