diff options
| author | Will Deacon <will.deacon@arm.com> | 2013-02-11 18:47:31 +0100 |
|---|---|---|
| committer | Olof Johansson <olof@lixom.net> | 2013-02-11 19:39:30 +0100 |
| commit | d24e638eb0d0cdc38bd8a2b04c83d21fc5afd1c4 (patch) | |
| tree | b3e1b84c36c343974a4e35f7ee587ea5ebdc171c /arch/arm/mach-virt | |
| parent | Merge branch 'for-arm-soc/virt/mach' of git://git.kernel.org/pub/scm/linux/ke... (diff) | |
| download | linux-d24e638eb0d0cdc38bd8a2b04c83d21fc5afd1c4.tar.xz linux-d24e638eb0d0cdc38bd8a2b04c83d21fc5afd1c4.zip | |
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>
Diffstat (limited to 'arch/arm/mach-virt')
| -rw-r--r-- | arch/arm/mach-virt/virt.c | 6 |
1 files changed, 1 insertions, 5 deletions
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, |