From: Olof Johansson Date: Sun, 10 Feb 2013 01:52:44 +0000 (-0800) Subject: Merge branch 'tegra/t114' into next/soc X-Git-Tag: v3.9-rc1~118^2~6 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=f58cf70ed954c179825cd0c51f5f64cd1ed74ed3;p=platform%2Fupstream%2Fkernel-adaptation-pc.git 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 --- f58cf70ed954c179825cd0c51f5f64cd1ed74ed3 diff --cc arch/arm/mach-tegra/board-dt-tegra114.c index 72598e2,b920df1..085d636 --- a/arch/arm/mach-tegra/board-dt-tegra114.c +++ b/arch/arm/mach-tegra/board-dt-tegra114.c @@@ -36,8 -37,9 +36,8 @@@ static const char * const tegra114_dt_b 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, - .handle_irq = gic_handle_irq, .init_time = clocksource_of_init, .init_machine = tegra114_dt_init, .init_late = tegra_init_late,