From: Richard Purdie <rpurdie@rpsys.net>
Date: Fri, 9 Sep 2005 17:54:04 +0000 (+0100)
Subject: [ARM] 2894/1: Sharp Scoop driver pm_message_t type fix
X-Git-Tag: v2.6.14-rc1~137^2
X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=daad56661d56cc382948fc95b74e17d3326b901b;p=linux-2.6-omap-h63xx.git

[ARM] 2894/1: Sharp Scoop driver pm_message_t type fix

Patch from Richard Purdie

Fix a pm_message_t type warning in the Sharp scoop driver

Signed-off-by: Richard Purdie <rpurdie@rpsys.net>
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
---

diff --git a/arch/arm/common/scoop.c b/arch/arm/common/scoop.c
index 688a595598c..d3a04c2a2c8 100644
--- a/arch/arm/common/scoop.c
+++ b/arch/arm/common/scoop.c
@@ -91,7 +91,7 @@ EXPORT_SYMBOL(read_scoop_reg);
 EXPORT_SYMBOL(write_scoop_reg);
 
 #ifdef CONFIG_PM
-static int scoop_suspend(struct device *dev, uint32_t state, uint32_t level)
+static int scoop_suspend(struct device *dev, pm_message_t state, uint32_t level)
 {
 	if (level == SUSPEND_POWER_DOWN) {
 		struct scoop_dev *sdev = dev_get_drvdata(dev);