From 4fd416c14c583ee6ff1e2b17ab05e7e02e170e4c Mon Sep 17 00:00:00 2001 From: Pavel Machek Date: Sat, 16 Apr 2005 15:25:24 -0700 Subject: [PATCH] Fix u32 vs. pm_message_t in drivers/char Here are fixes for drivers/char. Signed-off-by: Pavel Machek Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds --- drivers/char/sonypi.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'drivers/char/sonypi.c') diff --git a/drivers/char/sonypi.c b/drivers/char/sonypi.c index f97a8a9751a..c812191417c 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; -- cgit v1.2.3