diff --git a/[refs] b/[refs] index 7782c0530df0..cc5303a0e5cc 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 780dcdb21170ae8ad3faa640ede249261f216a8c +refs/heads/master: 26b97237f7eee977eb8beb59adbbf0a8ab4f8276 diff --git a/trunk/drivers/video/chipsfb.c b/trunk/drivers/video/chipsfb.c index f48e8c534c87..6796ba62c3c6 100644 --- a/trunk/drivers/video/chipsfb.c +++ b/trunk/drivers/video/chipsfb.c @@ -24,6 +24,7 @@ #include #include #include +#include #include #include #include @@ -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();