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/meye.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/meye.c')
-rw-r--r-- | drivers/media/video/meye.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/media/video/meye.c b/drivers/media/video/meye.c index be72c2ce242e..fe194012bccf 100644 --- a/drivers/media/video/meye.c +++ b/drivers/media/video/meye.c | |||
@@ -1768,7 +1768,7 @@ static struct video_device meye_template = { | |||
1768 | }; | 1768 | }; |
1769 | 1769 | ||
1770 | #ifdef CONFIG_PM | 1770 | #ifdef CONFIG_PM |
1771 | static int meye_suspend(struct pci_dev *pdev, u32 state) | 1771 | static int meye_suspend(struct pci_dev *pdev, pm_message_t state) |
1772 | { | 1772 | { |
1773 | pci_save_state(pdev); | 1773 | pci_save_state(pdev); |
1774 | meye.pm_mchip_mode = meye.mchip_mode; | 1774 | meye.pm_mchip_mode = meye.mchip_mode; |