From d24e638eb0d0cdc38bd8a2b04c83d21fc5afd1c4 Mon Sep 17 00:00:00 2001
From: Will Deacon <will.deacon@arm.com>
Date: Mon, 11 Feb 2013 17:47:31 +0000
Subject: [PATCH] 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>
---
arch/arm/mach-virt/virt.c | 6 +-----
1 file changed, 1 insertion(+), 5 deletions(-)
diff --git a/arch/arm/mach-virt/virt.c b/arch/arm/mach-virt/virt.c
index f6ed9cfeb2871..31666f6b43736 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,
--
GitLab