From 5214fd1a18a599b6cb810c6b4b31c41a4beb4b5b Mon Sep 17 00:00:00 2001
From: Stephen Warren <swarren@nvidia.com>
Date: Wed, 7 Nov 2012 17:24:28 -0700
Subject: [PATCH] --- yaml --- r: 355176 b: refs/heads/master c:
 656c669bc0cb9d2a621318b4b7300e8072930278 h: refs/heads/master v: v3

---
 [refs]                             | 2 +-
 trunk/arch/arm/plat-samsung/time.c | 7 ++++++-
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 4e6244af059e..574b83c02915 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 8726e96fcb29298351c777670742b553ca947508
+refs/heads/master: 656c669bc0cb9d2a621318b4b7300e8072930278
diff --git a/trunk/arch/arm/plat-samsung/time.c b/trunk/arch/arm/plat-samsung/time.c
index 67206df94aa8..773745a85f0f 100644
--- a/trunk/arch/arm/plat-samsung/time.c
+++ b/trunk/arch/arm/plat-samsung/time.c
@@ -27,6 +27,7 @@
 #include <linux/clk.h>
 #include <linux/io.h>
 #include <linux/platform_device.h>
+#include <linux/syscore_ops.h>
 
 #include <asm/mach-types.h>
 
@@ -271,6 +272,10 @@ static void __init s3c2410_timer_resources(void)
 	clk_enable(tin);
 }
 
+static struct syscore_ops s3c24xx_syscore_ops = {
+	.resume		= s3c2410_timer_setup,
+};
+
 static void __init s3c2410_timer_init(void)
 {
 	arch_gettimeoffset = s3c2410_gettimeoffset;
@@ -278,9 +283,9 @@ static void __init s3c2410_timer_init(void)
 	s3c2410_timer_resources();
 	s3c2410_timer_setup();
 	setup_irq(IRQ_TIMER4, &s3c2410_timer_irq);
+	register_syscore_ops(&s3c24xx_syscore_ops);
 }
 
 struct sys_timer s3c24xx_timer = {
 	.init		= s3c2410_timer_init,
-	.resume		= s3c2410_timer_setup
 };