diff options
author | Rafael J. Wysocki <rjw@sisk.pl> | 2007-07-26 13:41:12 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-07-26 14:35:18 -0400 |
commit | 26b97237f7eee977eb8beb59adbbf0a8ab4f8276 (patch) | |
tree | df794af668258e77312339f51089544c6aa65c96 /drivers | |
parent | 780dcdb21170ae8ad3faa640ede249261f216a8c (diff) |
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>
Diffstat (limited to 'drivers')
-rw-r--r-- | drivers/video/chipsfb.c | 3 |
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 @@ | |||
24 | #include <linux/delay.h> | 24 | #include <linux/delay.h> |
25 | #include <linux/interrupt.h> | 25 | #include <linux/interrupt.h> |
26 | #include <linux/fb.h> | 26 | #include <linux/fb.h> |
27 | #include <linux/pm.h> | ||
27 | #include <linux/init.h> | 28 | #include <linux/init.h> |
28 | #include <linux/pci.h> | 29 | #include <linux/pci.h> |
29 | #include <linux/console.h> | 30 | #include <linux/console.h> |
@@ -458,7 +459,7 @@ static int chipsfb_pci_suspend(struct pci_dev *pdev, pm_message_t state) | |||
458 | 459 | ||
459 | if (state.event == pdev->dev.power.power_state.event) | 460 | if (state.event == pdev->dev.power.power_state.event) |
460 | return 0; | 461 | return 0; |
461 | if (state.event != PM_SUSPEND_MEM) | 462 | if (state.event != PM_EVENT_SUSPEND) |
462 | goto done; | 463 | goto done; |
463 | 464 | ||
464 | acquire_console_sem(); | 465 | acquire_console_sem(); |