ARM: delete struct sys_timer

Now that the only field in struct sys_timer is .init, delete the struct,
and replace the machine descriptor .timer field with the initialization
function itself.

This will enable moving timer drivers into drivers/clocksource without
having to place a public prototype of each struct sys_timer object into
include/linux; the intent is to create a single of_clocksource_init()
function that determines which timer driver to initialize by scanning
the device dtree, much like the proposed irqchip_init() at:
http://www.spinics.net/lists/arm-kernel/msg203686.html

Includes mach-omap2 fixes from Igor Grinberg.

Tested-by: Robert Jarzmik <robert.jarzmik@free.fr>
Signed-off-by: Stephen Warren <swarren@nvidia.com>

1 files changed, 2 insertions, 2 deletions

diff --git a/arch/arm/mach-pxa/palmtreo.c b/arch/arm/mach-pxa/palmtreo.c
index 3f3c48f2f7ce..d17bda278782 100644
--- a/arch/arm/mach-pxa/palmtreo.c
+++ b/arch/arm/mach-pxa/palmtreo.c
@@ -451,7 +451,7 @@ MACHINE_START(TREO680, "Palm Treo 680")
         .nr_irqs        = PXA_NR_IRQS,
         .init_irq       = pxa27x_init_irq,
         .handle_irq       = pxa27x_handle_irq,
-        .timer          = &pxa_timer,
+        .init_time      = pxa_timer_init,
         .init_machine   = treo680_init,
         .restart        = pxa_restart,
 MACHINE_END
@@ -465,7 +465,7 @@ MACHINE_START(CENTRO, "Palm Centro 685")
         .nr_irqs        = PXA_NR_IRQS,
         .init_irq       = pxa27x_init_irq,
         .handle_irq       = pxa27x_handle_irq,
-        .timer          = &pxa_timer,
+        .init_time      = pxa_timer_init,
         .init_machine   = centro_init,
         .restart        = pxa_restart,
 MACHINE_END