Browse Source

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 <will.deacon@arm.com>
Signed-off-by: Olof Johansson <olof@lixom.net>
Will Deacon 12 years ago
parent
commit
d24e638eb0
1 changed files with 1 additions and 5 deletions
  1. 1 5
      arch/arm/mach-virt/virt.c

+ 1 - 5
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,