From 41f705be76c8d83b1d4d1474e1ee2313f11b0e34 Mon Sep 17 00:00:00 2001
From: Paul Mundt <lethal@linux-sh.org>
Date: Fri, 8 May 2009 16:47:48 +0900
Subject: [PATCH] --- yaml --- r: 146724 b: refs/heads/master c:
 6459d7bb72e9767bc7d22f2ee44aab35188e4b8a h: refs/heads/master v: v3

---
 [refs]                      |  2 +-
 trunk/arch/sh/kernel/time.c | 45 -------------------------------------
 2 files changed, 1 insertion(+), 46 deletions(-)

diff --git a/[refs] b/[refs]
index 116d72b8a307..5f03d0aa61e2 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 5ac5496411b30d41945a996fe7a7fb5abccf2aaa
+refs/heads/master: 6459d7bb72e9767bc7d22f2ee44aab35188e4b8a
diff --git a/trunk/arch/sh/kernel/time.c b/trunk/arch/sh/kernel/time.c
index f4c304adec42..c26576a5a454 100644
--- a/trunk/arch/sh/kernel/time.c
+++ b/trunk/arch/sh/kernel/time.c
@@ -97,51 +97,6 @@ static int __init rtc_generic_init(void)
 }
 module_init(rtc_generic_init);
 
-#ifdef CONFIG_PM
-int timer_suspend(struct sys_device *dev, pm_message_t state)
-{
-	struct sys_timer *sys_timer = container_of(dev, struct sys_timer, dev);
-
-	sys_timer->ops->stop();
-
-	return 0;
-}
-
-int timer_resume(struct sys_device *dev)
-{
-	struct sys_timer *sys_timer = container_of(dev, struct sys_timer, dev);
-
-	sys_timer->ops->start();
-
-	return 0;
-}
-#else
-#define timer_suspend NULL
-#define timer_resume NULL
-#endif
-
-static struct sysdev_class timer_sysclass = {
-	.name	 = "timer",
-	.suspend = timer_suspend,
-	.resume	 = timer_resume,
-};
-
-static int __init timer_init_sysfs(void)
-{
-	int ret;
-
-	if (!sys_timer)
-		return 0;
-
-	ret = sysdev_class_register(&timer_sysclass);
-	if (ret != 0)
-		return ret;
-
-	sys_timer->dev.cls = &timer_sysclass;
-	return sysdev_register(&sys_timer->dev);
-}
-device_initcall(timer_init_sysfs);
-
 void (*board_time_init)(void);
 
 struct clocksource clocksource_sh = {