summaryrefslogtreecommitdiffstats
path: root/drivers/media/video/meye.c
diff options
context:
space:
mode:
authorPavel Machek <pavel@ucw.cz>2005-04-17 00:25:27 +0200
committerLinus Torvalds <torvalds@ppc970.osdl.org>2005-04-17 00:25:27 +0200
commita291068991c4d0cc4c2bd533094422bf417c86dd (patch)
treedf3494c807602bdaa5e83cd04bf61c24bcfa516d /drivers/media/video/meye.c
parent[PATCH] fix u32 vs. pm_message_t in pcmcia (diff)
downloadlinux-a291068991c4d0cc4c2bd533094422bf417c86dd.tar.xz
linux-a291068991c4d0cc4c2bd533094422bf417c86dd.zip
[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.c2
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 = {
};
#ifdef CONFIG_PM
-static int meye_suspend(struct pci_dev *pdev, u32 state)
+static int meye_suspend(struct pci_dev *pdev, pm_message_t state)
{
pci_save_state(pdev);
meye.pm_mchip_mode = meye.mchip_mode;