From: Will Deacon Date: Mon, 11 Feb 2013 17:47:31 +0000 (+0000) Subject: ARM: mach-virt: fixup machine descriptor after removal of sys_timer X-Git-Tag: firefly_0821_release~3680^2~1068^2~3 X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=d24e638eb0d0cdc38bd8a2b04c83d21fc5afd1c4;p=firefly-linux-kernel-4.4.55.git ARM: mach-virt: fixup machine descriptor after removal of sys_timer Now that sys_timer has been removed, update the mach-virt machine descriptor to use a direct pointer to its timer_init function. Signed-off-by: Will Deacon Signed-off-by: Olof Johansson --- diff --git a/arch/arm/mach-virt/virt.c b/arch/arm/mach-virt/virt.c index f6ed9cfeb287..31666f6b4373 100644 --- a/arch/arm/mach-virt/virt.c +++ b/arch/arm/mach-virt/virt.c @@ -43,15 +43,11 @@ static const char *virt_dt_match[] = { NULL }; -static struct sys_timer virt_timer = { - .init = virt_timer_init, -}; - extern struct smp_operations virt_smp_ops; DT_MACHINE_START(VIRT, "Dummy Virtual Machine") .init_irq = irqchip_init, - .timer = &virt_timer, + .init_time = virt_timer_init, .init_machine = virt_init, .smp = smp_ops(virt_smp_ops), .dt_compat = virt_dt_match,