From ca8eb688248f432634cd3b06c906444640534e82 Mon Sep 17 00:00:00 2001
From: Paul Mundt <lethal@linux-sh.org>
Date: Tue, 7 Jul 2009 11:50:57 +0900
Subject: [PATCH] --- yaml --- r: 155062 b: refs/heads/master c:
 2dbc8a23cc2e677422f6dea991aca4e3d31ab65f h: refs/heads/master v: v3

---
 [refs]                      |  2 +-
 trunk/drivers/video/hitfb.c | 17 +++++++++--------
 2 files changed, 10 insertions(+), 9 deletions(-)

diff --git a/[refs] b/[refs]
index e9689ab790fa..9e0d9c2e68ab 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 684dcd056178a04374c71459dbd2b18c6d958ef7
+refs/heads/master: 2dbc8a23cc2e677422f6dea991aca4e3d31ab65f
diff --git a/trunk/drivers/video/hitfb.c b/trunk/drivers/video/hitfb.c
index 3ae896d55a58..e7116a6d82d3 100644
--- a/trunk/drivers/video/hitfb.c
+++ b/trunk/drivers/video/hitfb.c
@@ -429,8 +429,7 @@ static int __exit hitfb_remove(struct platform_device *dev)
 	return 0;
 }
 
-#ifdef CONFIG_PM
-static int hitfb_suspend(struct platform_device *dev, pm_message_t state)
+static int hitfb_suspend(struct device *dev)
 {
 	u16 v;
 
@@ -442,7 +441,7 @@ static int hitfb_suspend(struct platform_device *dev, pm_message_t state)
 	return 0;
 }
 
-static int hitfb_resume(struct platform_device *dev)
+static int hitfb_resume(struct device *dev)
 {
 	u16 v;
 
@@ -456,17 +455,19 @@ static int hitfb_resume(struct platform_device *dev)
 
 	return 0;
 }
-#endif
+
+static struct dev_pm_ops hitfb_dev_pm_ops = {
+	.suspend	= hitfb_suspend,
+	.resume		= hitfb_resume,
+};
 
 static struct platform_driver hitfb_driver = {
 	.probe		= hitfb_probe,
 	.remove		= __exit_p(hitfb_remove),
-#ifdef CONFIG_PM
-	.suspend	= hitfb_suspend,
-	.resume		= hitfb_resume,
-#endif
 	.driver		= {
 		.name	= "hitfb",
+		.owner	= THIS_MODULE,
+		.pm	= &hitfb_dev_pm_ops,
 	},
 };