X-Git-Url: http://pilppa.org/gitweb/gitweb.cgi?a=blobdiff_plain;f=drivers%2Fvideo%2Fchipsfb.c;h=bc061d4ec78695f70369f1276bb45b50cdd6f04f;hb=150a631fc55e33df28a6846371e7f86e9e75e8cb;hp=e75a965ec760324ff3ebe5705ebdeb4fb4c97ac6;hpb=1bad3f4050b2a641bbfeaddb2717b28247311e9c;p=linux-2.6-omap-h63xx.git

diff --git a/drivers/video/chipsfb.c b/drivers/video/chipsfb.c
index e75a965ec76..bc061d4ec78 100644
--- a/drivers/video/chipsfb.c
+++ b/drivers/video/chipsfb.c
@@ -91,7 +91,6 @@ static struct fb_ops chipsfb_ops = {
 	.fb_fillrect	= cfb_fillrect,
 	.fb_copyarea	= cfb_copyarea,
 	.fb_imageblit	= cfb_imageblit,
-	.fb_cursor	= soft_cursor,
 };
 
 static int chipsfb_check_var(struct fb_var_screeninfo *var,
@@ -462,9 +461,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();