aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/video/savage
diff options
context:
space:
mode:
authorPavel Machek <pavel@ucw.cz>2005-04-16 18:25:36 -0400
committerLinus Torvalds <torvalds@ppc970.osdl.org>2005-04-16 18:25:36 -0400
commit9bfd354b1b9c2f4faee121892bdfbc1490b51ab5 (patch)
tree292b71ae99b8ad8d699237d6fc8b718636ef5f2d /drivers/video/savage
parent0370affeec3e751412e917aab931d8ba52680578 (diff)
[PATCH] fix u32 vs. pm_message_t in driver/video
This fixes u32 vs. pm_message_t confusion in drivers/video. Should change no code. 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/video/savage')
-rw-r--r--drivers/video/savage/savagefb_driver.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/video/savage/savagefb_driver.c b/drivers/video/savage/savagefb_driver.c
index e1c9c946be2d..5bb8d60f35c4 100644
--- a/drivers/video/savage/savagefb_driver.c
+++ b/drivers/video/savage/savagefb_driver.c
@@ -2103,7 +2103,7 @@ static void __devexit savagefb_remove (struct pci_dev *dev)
2103 } 2103 }
2104} 2104}
2105 2105
2106static int savagefb_suspend (struct pci_dev* dev, u32 state) 2106static int savagefb_suspend (struct pci_dev* dev, pm_message_t state)
2107{ 2107{
2108 struct fb_info *info = 2108 struct fb_info *info =
2109 (struct fb_info *)pci_get_drvdata(dev); 2109 (struct fb_info *)pci_get_drvdata(dev);
@@ -2118,7 +2118,7 @@ static int savagefb_suspend (struct pci_dev* dev, u32 state)
2118 release_console_sem(); 2118 release_console_sem();
2119 2119
2120 pci_disable_device(dev); 2120 pci_disable_device(dev);
2121 pci_set_power_state(dev, state); 2121 pci_set_power_state(dev, pci_choose_state(dev, state));
2122 2122
2123 return 0; 2123 return 0;
2124} 2124}