Merge remote-tracking branch 'fbdev/for-next'

[karo-tx-linux.git] / drivers / video / aty / aty128fb.c

diff --git a/drivers/video/aty/aty128fb.c b/drivers/video/aty/aty128fb.c
index a4dfe8cb0a0a1b2cb5022c8e27f23f6b314a8026..b5edb6f08b845fd237f66c5cf9c08cf1fa8c3b7e 100644 (file)
--- a/drivers/video/aty/aty128fb.c
+++ b/drivers/video/aty/aty128fb.c
@@ -413,7 +413,6 @@ struct aty128fb_par {
        int blitter_may_be_busy;
        int fifo_slots;                 /* free slots in FIFO (64 max) */
 
-       int     pm_reg;
        int crt_on, lcd_on;
        struct pci_dev *pdev;
        struct fb_info *next;
@@ -2016,7 +2015,6 @@ static int aty128_init(struct pci_dev *pdev, const struct pci_device_id *ent)
 
        aty128_init_engine(par);
 
-       par->pm_reg = pdev->pm_cap;
        par->pdev = pdev;
        par->asleep = 0;
        par->lock_blank = 0;
@@ -2397,7 +2395,7 @@ static void aty128_set_suspend(struct aty128fb_par *par, int suspend)
        u32     pmgt;
        struct pci_dev *pdev = par->pdev;
 
-       if (!par->pm_reg)
+       if (!par->pdev->pm_cap)
                return;
                
        /* Set the chip into the appropriate suspend mode (we use D2,