summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRafael J. Wysocki2007-07-26 19:41:12 +0200
committerLinus Torvalds2007-07-26 20:35:18 +0200
commit26b97237f7eee977eb8beb59adbbf0a8ab4f8276 (patch)
treedf794af668258e77312339f51089544c6aa65c96
parentfix inode_table test in ext234_check_descriptors (diff)
downloadkernel-qcow2-linux-26b97237f7eee977eb8beb59adbbf0a8ab4f8276.tar.gz
kernel-qcow2-linux-26b97237f7eee977eb8beb59adbbf0a8ab4f8276.tar.xz
kernel-qcow2-linux-26b97237f7eee977eb8beb59adbbf0a8ab4f8276.zip
chipsfb: use correct pm state
chipsfb.c shouldn't use PM_SUSPEND_MEM in there, but PM_EVENT_SUSPEND. Cc: Cedric Le Goater <clg@fr.ibm.com> Cc: "Antonino A. Daplas" <adaplas@pol.net> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
-rw-r--r--drivers/video/chipsfb.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/video/chipsfb.c b/drivers/video/chipsfb.c
index f48e8c534c87..6796ba62c3c6 100644
--- a/drivers/video/chipsfb.c
+++ b/drivers/video/chipsfb.c
@@ -24,6 +24,7 @@
#include <linux/delay.h>
#include <linux/interrupt.h>
#include <linux/fb.h>
+#include <linux/pm.h>
#include <linux/init.h>
#include <linux/pci.h>
#include <linux/console.h>
@@ -458,7 +459,7 @@ static int chipsfb_pci_suspend(struct pci_dev *pdev, pm_message_t state)
if (state.event == pdev->dev.power.power_state.event)
return 0;
- if (state.event != PM_SUSPEND_MEM)
+ if (state.event != PM_EVENT_SUSPEND)
goto done;
acquire_console_sem();