diff options
Diffstat (limited to 'drivers/video/aty/atyfb_base.c')
-rw-r--r-- | drivers/video/aty/atyfb_base.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/drivers/video/aty/atyfb_base.c b/drivers/video/aty/atyfb_base.c index bd4ac0bafecb..d7ba3f1a4d80 100644 --- a/drivers/video/aty/atyfb_base.c +++ b/drivers/video/aty/atyfb_base.c | |||
@@ -2709,8 +2709,7 @@ static int atyfb_blank(int blank, struct fb_info *info) | |||
2709 | if (par->lock_blank || par->asleep) | 2709 | if (par->lock_blank || par->asleep) |
2710 | return 0; | 2710 | return 0; |
2711 | 2711 | ||
2712 | #ifdef CONFIG_FB_ATY_BACKLIGHT | 2712 | #ifdef CONFIG_FB_ATY_GENERIC_LCD |
2713 | #elif defined(CONFIG_FB_ATY_GENERIC_LCD) | ||
2714 | if (par->lcd_table && blank > FB_BLANK_NORMAL && | 2713 | if (par->lcd_table && blank > FB_BLANK_NORMAL && |
2715 | (aty_ld_lcd(LCD_GEN_CNTL, par) & LCD_ON)) { | 2714 | (aty_ld_lcd(LCD_GEN_CNTL, par) & LCD_ON)) { |
2716 | u32 pm = aty_ld_lcd(POWER_MANAGEMENT, par); | 2715 | u32 pm = aty_ld_lcd(POWER_MANAGEMENT, par); |
@@ -2739,8 +2738,7 @@ static int atyfb_blank(int blank, struct fb_info *info) | |||
2739 | } | 2738 | } |
2740 | aty_st_le32(CRTC_GEN_CNTL, gen_cntl, par); | 2739 | aty_st_le32(CRTC_GEN_CNTL, gen_cntl, par); |
2741 | 2740 | ||
2742 | #ifdef CONFIG_FB_ATY_BACKLIGHT | 2741 | #ifdef CONFIG_FB_ATY_GENERIC_LCD |
2743 | #elif defined(CONFIG_FB_ATY_GENERIC_LCD) | ||
2744 | if (par->lcd_table && blank <= FB_BLANK_NORMAL && | 2742 | if (par->lcd_table && blank <= FB_BLANK_NORMAL && |
2745 | (aty_ld_lcd(LCD_GEN_CNTL, par) & LCD_ON)) { | 2743 | (aty_ld_lcd(LCD_GEN_CNTL, par) & LCD_ON)) { |
2746 | u32 pm = aty_ld_lcd(POWER_MANAGEMENT, par); | 2744 | u32 pm = aty_ld_lcd(POWER_MANAGEMENT, par); |