summaryrefslogtreecommitdiffstats
path: root/arch/arm
diff options
context:
space:
mode:
authorRichard Purdie <rpurdie@rpsys.net>2005-09-09 19:54:04 +0200
committerRussell King <rmk+kernel@arm.linux.org.uk>2005-09-09 19:54:04 +0200
commitdaad56661d56cc382948fc95b74e17d3326b901b (patch)
tree9c3b5195646882044f39baef859621cc27510de5 /arch/arm
parent[ARM] 2893/1: [MMC] Update corgi to use the new mmc delayed detection function (diff)
downloadlinux-daad56661d56cc382948fc95b74e17d3326b901b.tar.xz
linux-daad56661d56cc382948fc95b74e17d3326b901b.zip
[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>
Diffstat (limited to 'arch/arm')
-rw-r--r--arch/arm/common/scoop.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/common/scoop.c b/arch/arm/common/scoop.c
index 688a595598c8..d3a04c2a2c85 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);