| Message ID | 1361043816-28753-1-git-send-email-jason@lakedaemon.net (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
On Saturday 16 February 2013, Jason Cooper wrote: > In the latest arm-soc/for-next, building dove_defconfig breaks because > .timer has been replaced with .init_timer in DT_MACHINE_START. With > this fix, it builds fine. When I look at arm-soc/for-next, there is no arch/arm/mach-dove/board-dt.c file, so it currently builds cleanly and the problem is only when merging your branch with the arm-soc/timer/cleanup branch. This is not hard to fix, and there are two ways that work equally well, just pick one that works for you: * rebase your branch on top of the arm-soc/timer/cleanup branch and let us know about the dependency when you send a pull request for it. * if you don't want to rebase your branch, pull arm-soc/timer/cleanup into it and do this change in the merge changeset, noting it down in the changeset description. As above, when you send such a branch, let us know of the dependency. If the branch with the merge problem is destined for 3.10, the timer cleanups will already be in there, so you can simply base on them now and don't need to track the dependencies. Arnd
Arnd, On Sun, Feb 17, 2013 at 06:23:44PM +0000, Arnd Bergmann wrote: > On Saturday 16 February 2013, Jason Cooper wrote: > > In the latest arm-soc/for-next, building dove_defconfig breaks because > > .timer has been replaced with .init_timer in DT_MACHINE_START. With > > this fix, it builds fine. ... > * if you don't want to rebase your branch, pull arm-soc/timer/cleanup > into it and do this change in the merge changeset, noting it down > in the changeset description. As above, when you send such a branch, > let us know of the dependency. Done. I'll send a follow-on pull request for mvebu/boards. Thanks for the clarification. Jason.
diff --git a/arch/arm/mach-dove/board-dt.c b/arch/arm/mach-dove/board-dt.c index ee11b31..fbde1dd 100644 --- a/arch/arm/mach-dove/board-dt.c +++ b/arch/arm/mach-dove/board-dt.c @@ -85,7 +85,7 @@ DT_MACHINE_START(DOVE_DT, "Marvell Dove (Flattened Device Tree)") .map_io = dove_map_io, .init_early = dove_init_early, .init_irq = orion_dt_init_irq, - .timer = &dove_timer, + .init_time = dove_timer_init, .init_machine = dove_dt_init, .restart = dove_restart, .dt_compat = dove_dt_board_compat,
In the latest arm-soc/for-next, building dove_defconfig breaks because .timer has been replaced with .init_timer in DT_MACHINE_START. With this fix, it builds fine. Signed-off-by: Jason Cooper <jason@lakedaemon.net> --- Not sure where you guys want to apply this. If I apply it to any one my branches (without arm-soc/for-next), they break. arch/arm/mach-dove/board-dt.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)