Hi All, On Wed, 16 Jan 2013 14:10:16 +1100 Stephen Rothwell <[email protected]> wrote: > > Today's linux-next merge of the tegra tree got a conflict in > arch/arm/mach-tegra/board-dt-tegra20.c between commit 1d5cc604f42f ("ARM: > remove mach .handle_irq for GIC users") from the arm-soc tree and commit > ac0fd9eca3ba ("ARM: tegra: move timer.c to drivers/clocksource/") from > the tegra tree.
This also affected arch/arm/mach-tegra/board-dt-tegra30.c. -- Cheers, Stephen Rothwell [email protected] diff --cc arch/arm/mach-tegra/board-dt-tegra30.c index 12dc2dd,cfe5fc0..0000000 --- a/arch/arm/mach-tegra/board-dt-tegra30.c +++ b/arch/arm/mach-tegra/board-dt-tegra30.c @@@ -111,7 -113,8 +112,7 @@@ DT_MACHINE_START(TEGRA30_DT, "NVIDIA Te .map_io = tegra_map_common_io, .init_early = tegra30_init_early, .init_irq = tegra_dt_init_irq, - .init_time = tegra_init_timer, - .handle_irq = gic_handle_irq, + .init_time = clocksource_of_init, .init_machine = tegra30_dt_init, .init_late = tegra_init_late, .restart = tegra_assert_system_reset,
pgpqEBX8SkDVa.pgp
Description: PGP signature
