Merge master.kernel.org:/home/rmk/linux-2.6-arm

[powerpc.git] / drivers / video / chipsfb.c

diff --git a/drivers/video/chipsfb.c b/drivers/video/chipsfb.c
index e75a965..4131243 100644 (file)
--- a/drivers/video/chipsfb.c
+++ b/drivers/video/chipsfb.c
@@ -462,9 +462,9 @@ static int chipsfb_pci_suspend(struct pci_dev *pdev, pm_message_t state)
 {
         struct fb_info *p = pci_get_drvdata(pdev);
 
-       if (state == pdev->dev.power.power_state)
+       if (state.event == pdev->dev.power.power_state.event)
                return 0;
-       if (state != PM_SUSPEND_MEM)
+       if (state.event != PM_SUSPEND_MEM)
                goto done;
 
        acquire_console_sem();