projects / GitHub / exynos8895 / android_kernel_samsung_universal8895.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: c3e00a0 3bdc348)
Merge remote-tracking branch 'rmk/devel-stable' into for-3.3/soc
authorOlof Johansson <olof@lixom.net>
Sun, 18 Dec 2011 04:05:50 +0000 (20:05 -0800)
committerOlof Johansson <olof@lixom.net>
Sun, 18 Dec 2011 04:05:50 +0000 (20:05 -0800)
Conflicts:
arch/arm/mach-tegra/board-dt.c

Signed-off-by: Olof Johansson <olof@lixom.net>
1  2 
arch/arm/mach-tegra/board-dt.c patch | diff1 | diff2 | blob | history

diff --cc arch/arm/mach-tegra/board-dt.c
index 2fa599da7deb631f73e8da6356c220ad5305d02b,f6f03ce340fcafd4a0f72dff707ad3764a6321e2..c21863d6425da47b720d965a9a93a165deceaa3e
--- 1/arch/arm/mach-tegra/board-dt.c
--- 2/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,