aboutsummaryrefslogtreecommitdiff
path: root/drivers/media/video/msp3400.c
diff options
context:
space:
mode:
authorPavel Machek <pavel@ucw.cz>2005-04-16 15:25:27 -0700
committerLinus Torvalds <torvalds@ppc970.osdl.org>2005-04-16 15:25:27 -0700
commita291068991c4d0cc4c2bd533094422bf417c86dd (patch)
treedf3494c807602bdaa5e83cd04bf61c24bcfa516d /drivers/media/video/msp3400.c
parent8bf28030f3683f69669d08cb5b32bc46db3d22ae (diff)
[PATCH] fix u32 vs. pm_message_t in drivers/media
Here are fixes for drivers/media. 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/media/video/msp3400.c')
-rw-r--r--drivers/media/video/msp3400.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/media/video/msp3400.c b/drivers/media/video/msp3400.c
index d996ec99caf..c97df705df5 100644
--- a/drivers/media/video/msp3400.c
+++ b/drivers/media/video/msp3400.c
@@ -1426,7 +1426,7 @@ static int msp_detach(struct i2c_client *client);
static int msp_probe(struct i2c_adapter *adap);
static int msp_command(struct i2c_client *client, unsigned int cmd, void *arg);
-static int msp_suspend(struct device * dev, u32 state, u32 level);
+static int msp_suspend(struct device * dev, pm_message_t state, u32 level);
static int msp_resume(struct device * dev, u32 level);
static void msp_wake_thread(struct i2c_client *client);
@@ -1834,7 +1834,7 @@ static int msp_command(struct i2c_client *client, unsigned int cmd, void *arg)
return 0;
}
-static int msp_suspend(struct device * dev, u32 state, u32 level)
+static int msp_suspend(struct device * dev, pm_message_t state, u32 level)
{
struct i2c_client *c = container_of(dev, struct i2c_client, dev);