diff options
author | Pavel Machek <pavel@ucw.cz> | 2005-04-16 18:25:27 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@ppc970.osdl.org> | 2005-04-16 18:25:27 -0400 |
commit | a291068991c4d0cc4c2bd533094422bf417c86dd (patch) | |
tree | df3494c807602bdaa5e83cd04bf61c24bcfa516d /drivers/media/video/msp3400.c | |
parent | 8bf28030f3683f69669d08cb5b32bc46db3d22ae (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.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/media/video/msp3400.c b/drivers/media/video/msp3400.c index d996ec99caff..c97df705df5e 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); | |||
1426 | static int msp_probe(struct i2c_adapter *adap); | 1426 | static int msp_probe(struct i2c_adapter *adap); |
1427 | static int msp_command(struct i2c_client *client, unsigned int cmd, void *arg); | 1427 | static int msp_command(struct i2c_client *client, unsigned int cmd, void *arg); |
1428 | 1428 | ||
1429 | static int msp_suspend(struct device * dev, u32 state, u32 level); | 1429 | static int msp_suspend(struct device * dev, pm_message_t state, u32 level); |
1430 | static int msp_resume(struct device * dev, u32 level); | 1430 | static int msp_resume(struct device * dev, u32 level); |
1431 | 1431 | ||
1432 | static void msp_wake_thread(struct i2c_client *client); | 1432 | 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) | |||
1834 | return 0; | 1834 | return 0; |
1835 | } | 1835 | } |
1836 | 1836 | ||
1837 | static int msp_suspend(struct device * dev, u32 state, u32 level) | 1837 | static int msp_suspend(struct device * dev, pm_message_t state, u32 level) |
1838 | { | 1838 | { |
1839 | struct i2c_client *c = container_of(dev, struct i2c_client, dev); | 1839 | struct i2c_client *c = container_of(dev, struct i2c_client, dev); |
1840 | 1840 | ||