From: Olof Johansson Date: Sun, 18 Dec 2011 04:05:50 +0000 (-0800) Subject: Merge remote-tracking branch 'rmk/devel-stable' into for-3.3/soc X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=d695cfa54e9ec48aeb149cadc8dab1240751572a;p=linux-beck.git Merge remote-tracking branch 'rmk/devel-stable' into for-3.3/soc Conflicts: arch/arm/mach-tegra/board-dt.c Signed-off-by: Olof Johansson --- d695cfa54e9ec48aeb149cadc8dab1240751572a diff --cc arch/arm/mach-tegra/board-dt.c index 2fa599da7deb,f6f03ce340fc..c21863d6425d --- a/arch/arm/mach-tegra/board-dt.c +++ b/arch/arm/mach-tegra/board-dt.c @@@ -150,7 -130,8 +151,8 @@@ static const char * tegra_dt_board_comp DT_MACHINE_START(TEGRA_DT, "nVidia Tegra (Flattened Device Tree)") .map_io = tegra_map_common_io, .init_early = tegra_init_early, - .init_irq = tegra_init_irq, + .init_irq = tegra_dt_init_irq, + .handle_irq = gic_handle_irq, .timer = &tegra_timer, .init_machine = tegra_dt_init, .dt_compat = tegra_dt_board_compat,