From c771c3970b56a1e782920f659c00b366cdf9e69d Mon Sep 17 00:00:00 2001
From: "Rafael J. Wysocki" <rjw@sisk.pl>
Date: Sat, 30 Jun 2012 23:50:47 +0200
Subject: [PATCH] --- yaml --- r: 312762 b: refs/heads/master c:
 e25d5c11eeeec610af2e0ff51e60d7cdadefe0f2 h: refs/heads/master v: v3

---
 [refs]                             | 2 +-
 trunk/drivers/platform/x86/hdaps.c | 6 ++++--
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index 6c221913dcf1..22a0d64634d0 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 199ac0529eac0341b232b450e43fad71d1513e94
+refs/heads/master: e25d5c11eeeec610af2e0ff51e60d7cdadefe0f2
diff --git a/trunk/drivers/platform/x86/hdaps.c b/trunk/drivers/platform/x86/hdaps.c
index 24a3ae065f1b..d9ab6f64dcec 100644
--- a/trunk/drivers/platform/x86/hdaps.c
+++ b/trunk/drivers/platform/x86/hdaps.c
@@ -305,17 +305,19 @@ static int hdaps_probe(struct platform_device *dev)
 	return 0;
 }
 
-static int hdaps_resume(struct platform_device *dev)
+static int hdaps_resume(struct device *dev)
 {
 	return hdaps_device_init();
 }
 
+static SIMPLE_DEV_PM_OPS(hdaps_pm, NULL, hdaps_resume);
+
 static struct platform_driver hdaps_driver = {
 	.probe = hdaps_probe,
-	.resume = hdaps_resume,
 	.driver	= {
 		.name = "hdaps",
 		.owner = THIS_MODULE,
+		.pm = &hdaps_pm,
 	},
 };