From 91c6fee0e06c5882cdd417114682b3cf2f12ee1c Mon Sep 17 00:00:00 2001
From: Viresh Kumar <viresh.kumar@st.com>
Date: Wed, 11 Jan 2012 15:25:20 +0530
Subject: [PATCH] --- yaml --- r: 296906 b: refs/heads/master c:
 6e33aceda2d82126e9d08a39e21a15be0dd00a6c h: refs/heads/master v: v3

---
 [refs]                          | 2 +-
 trunk/drivers/gpio/gpio-pl061.c | 7 ++++++-
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index e505904818c5..ecdd0a3cc345 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 864533ceb6db336dead389577c102a8b792a121a
+refs/heads/master: 6e33aceda2d82126e9d08a39e21a15be0dd00a6c
diff --git a/trunk/drivers/gpio/gpio-pl061.c b/trunk/drivers/gpio/gpio-pl061.c
index 77c9cc70fa77..b4b5da4fd2cc 100644
--- a/trunk/drivers/gpio/gpio-pl061.c
+++ b/trunk/drivers/gpio/gpio-pl061.c
@@ -352,7 +352,12 @@ static int pl061_resume(struct device *dev)
 	return 0;
 }
 
-static SIMPLE_DEV_PM_OPS(pl061_dev_pm_ops, pl061_suspend, pl061_resume);
+static const struct dev_pm_ops pl061_dev_pm_ops = {
+	.suspend = pl061_suspend,
+	.resume = pl061_resume,
+	.freeze = pl061_suspend,
+	.restore = pl061_resume,
+};
 #endif
 
 static struct amba_id pl061_ids[] = {