summaryrefslogtreecommitdiff
path: root/drivers/char/sonypi.c
diff options
context:
space:
mode:
authorPavel Machek <pavel@ucw.cz>2005-04-17 02:25:24 +0400
committerLinus Torvalds <torvalds@ppc970.osdl.org>2005-04-17 02:25:24 +0400
commit4fd416c14c583ee6ff1e2b17ab05e7e02e170e4c (patch)
tree4836046f082166b604e43eb3c6009682007ba5fe /drivers/char/sonypi.c
parent438510f6f079e94df294936b5bd8a7fd679cd1c9 (diff)
downloadlinux-4fd416c14c583ee6ff1e2b17ab05e7e02e170e4c.tar.xz
[PATCH] Fix u32 vs. pm_message_t in drivers/char
Here are fixes for drivers/char. Signed-off-by: Pavel Machek <pavel@suse.cz> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'drivers/char/sonypi.c')
-rw-r--r--drivers/char/sonypi.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/char/sonypi.c b/drivers/char/sonypi.c
index f97a8a9751a0..c812191417c3 100644
--- a/drivers/char/sonypi.c
+++ b/drivers/char/sonypi.c
@@ -1103,7 +1103,7 @@ static int sonypi_disable(void)
#ifdef CONFIG_PM
static int old_camera_power;
-static int sonypi_suspend(struct device *dev, u32 state, u32 level)
+static int sonypi_suspend(struct device *dev, pm_message_t state, u32 level)
{
if (level == SUSPEND_DISABLE) {
old_camera_power = sonypi_device.camera_power;