5 files changed, 5 insertions, 25 deletions

diff --git a/arch/arm/mach-realview/realview_eb.c b/arch/arm/mach-realview/realview_eb.c
index 728587c60770..5b1c8bfe6fa9 100644
--- a/arch/arm/mach-realview/realview_eb.c
+++ b/arch/arm/mach-realview/realview_eb.c
@@ -418,10 +418,6 @@ static void __init realview_eb_timer_init(void)
         realview_eb_twd_init();
 }
 
-static struct sys_timer realview_eb_timer = {
-        .init           = realview_eb_timer_init,
-};
-
 static void realview_eb_restart(char mode, const char *cmd)
 {
         void __iomem *reset_ctrl = __io_address(REALVIEW_SYS_RESETCTL);
@@ -472,7 +468,7 @@ MACHINE_START(REALVIEW_EB, "ARM-RealView EB")
         .map_io         = realview_eb_map_io,
         .init_early     = realview_init_early,
         .init_irq       = gic_init_irq,
-        .timer          = &realview_eb_timer,
+        .init_time      = realview_eb_timer_init,
         .init_machine   = realview_eb_init,
 #ifdef CONFIG_ZONE_DMA
         .dma_zone_size  = SZ_256M,
diff --git a/arch/arm/mach-realview/realview_pb1176.c b/arch/arm/mach-realview/realview_pb1176.c
index 3d116c44c0d4..d5e83a1f6982 100644
--- a/arch/arm/mach-realview/realview_pb1176.c
+++ b/arch/arm/mach-realview/realview_pb1176.c
@@ -329,10 +329,6 @@ static void __init realview_pb1176_timer_init(void)
         realview_timer_init(IRQ_DC1176_TIMER0);
 }
 
-static struct sys_timer realview_pb1176_timer = {
-        .init           = realview_pb1176_timer_init,
-};
-
 static void realview_pb1176_restart(char mode, const char *cmd)
 {
         void __iomem *reset_ctrl = __io_address(REALVIEW_SYS_RESETCTL);
@@ -384,7 +380,7 @@ MACHINE_START(REALVIEW_PB1176, "ARM-RealView PB1176")
         .map_io         = realview_pb1176_map_io,
         .init_early     = realview_init_early,
         .init_irq       = gic_init_irq,
-        .timer          = &realview_pb1176_timer,
+        .init_time      = realview_pb1176_timer_init,
         .init_machine   = realview_pb1176_init,
 #ifdef CONFIG_ZONE_DMA
         .dma_zone_size  = SZ_256M,
diff --git a/arch/arm/mach-realview/realview_pb11mp.c b/arch/arm/mach-realview/realview_pb11mp.c
index e1b8efdf35b6..c3cfe213b5e6 100644
--- a/arch/arm/mach-realview/realview_pb11mp.c
+++ b/arch/arm/mach-realview/realview_pb11mp.c
@@ -316,10 +316,6 @@ static void __init realview_pb11mp_timer_init(void)
         realview_pb11mp_twd_init();
 }
 
-static struct sys_timer realview_pb11mp_timer = {
-        .init           = realview_pb11mp_timer_init,
-};
-
 static void realview_pb11mp_restart(char mode, const char *cmd)
 {
         void __iomem *reset_ctrl = __io_address(REALVIEW_SYS_RESETCTL);
@@ -367,7 +363,7 @@ MACHINE_START(REALVIEW_PB11MP, "ARM-RealView PB11MPCore")
         .map_io         = realview_pb11mp_map_io,
         .init_early     = realview_init_early,
         .init_irq       = gic_init_irq,
-        .timer          = &realview_pb11mp_timer,
+        .init_time      = realview_pb11mp_timer_init,
         .init_machine   = realview_pb11mp_init,
 #ifdef CONFIG_ZONE_DMA
         .dma_zone_size  = SZ_256M,
diff --git a/arch/arm/mach-realview/realview_pba8.c b/arch/arm/mach-realview/realview_pba8.c
index 0b037f23b0f6..dde652a59620 100644
--- a/arch/arm/mach-realview/realview_pba8.c
+++ b/arch/arm/mach-realview/realview_pba8.c
@@ -264,10 +264,6 @@ static void __init realview_pba8_timer_init(void)
         realview_timer_init(IRQ_PBA8_TIMER0_1);
 }
 
-static struct sys_timer realview_pba8_timer = {
-        .init           = realview_pba8_timer_init,
-};
-
 static void realview_pba8_restart(char mode, const char *cmd)
 {
         void __iomem *reset_ctrl = __io_address(REALVIEW_SYS_RESETCTL);
@@ -308,7 +304,7 @@ MACHINE_START(REALVIEW_PBA8, "ARM-RealView PB-A8")
         .map_io         = realview_pba8_map_io,
         .init_early     = realview_init_early,
         .init_irq       = gic_init_irq,
-        .timer          = &realview_pba8_timer,
+        .init_time      = realview_pba8_timer_init,
         .init_machine   = realview_pba8_init,
 #ifdef CONFIG_ZONE_DMA
         .dma_zone_size  = SZ_256M,
diff --git a/arch/arm/mach-realview/realview_pbx.c b/arch/arm/mach-realview/realview_pbx.c
index a1f1ef557c67..54f0185b01e3 100644
--- a/arch/arm/mach-realview/realview_pbx.c
+++ b/arch/arm/mach-realview/realview_pbx.c
@@ -324,10 +324,6 @@ static void __init realview_pbx_timer_init(void)
         realview_pbx_twd_init();
 }
 
-static struct sys_timer realview_pbx_timer = {
-        .init           = realview_pbx_timer_init,
-};
-
 static void realview_pbx_fixup(struct tag *tags, char **from,
                                struct meminfo *meminfo)
 {
@@ -404,7 +400,7 @@ MACHINE_START(REALVIEW_PBX, "ARM-RealView PBX")
         .map_io         = realview_pbx_map_io,
         .init_early     = realview_init_early,
         .init_irq       = gic_init_irq,
-        .timer          = &realview_pbx_timer,
+        .init_time      = realview_pbx_timer_init,
         .init_machine   = realview_pbx_init,
 #ifdef CONFIG_ZONE_DMA
         .dma_zone_size  = SZ_256M,