diff options
Diffstat (limited to 'drivers/video/aty/atyfb_base.c')
-rw-r--r-- | drivers/video/aty/atyfb_base.c | 16 |
1 files changed, 0 insertions, 16 deletions
diff --git a/drivers/video/aty/atyfb_base.c b/drivers/video/aty/atyfb_base.c index 23deb3566020..3b6529392359 100644 --- a/drivers/video/aty/atyfb_base.c +++ b/drivers/video/aty/atyfb_base.c | |||
@@ -2183,18 +2183,6 @@ static struct backlight_properties aty_bl_data = { | |||
2183 | .max_brightness = (FB_BACKLIGHT_LEVELS - 1), | 2183 | .max_brightness = (FB_BACKLIGHT_LEVELS - 1), |
2184 | }; | 2184 | }; |
2185 | 2185 | ||
2186 | static void aty_bl_set_power(struct fb_info *info, int power) | ||
2187 | { | ||
2188 | mutex_lock(&info->bl_mutex); | ||
2189 | |||
2190 | if (info->bl_dev) { | ||
2191 | info->bl_dev->props->power = power; | ||
2192 | __aty_bl_update_status(info->bl_dev); | ||
2193 | } | ||
2194 | |||
2195 | mutex_unlock(&info->bl_mutex); | ||
2196 | } | ||
2197 | |||
2198 | static void aty_bl_init(struct atyfb_par *par) | 2186 | static void aty_bl_init(struct atyfb_par *par) |
2199 | { | 2187 | { |
2200 | struct fb_info *info = pci_get_drvdata(par->pdev); | 2188 | struct fb_info *info = pci_get_drvdata(par->pdev); |
@@ -2809,8 +2797,6 @@ static int atyfb_blank(int blank, struct fb_info *info) | |||
2809 | return 0; | 2797 | return 0; |
2810 | 2798 | ||
2811 | #ifdef CONFIG_FB_ATY_BACKLIGHT | 2799 | #ifdef CONFIG_FB_ATY_BACKLIGHT |
2812 | if (machine_is(powermac) && blank > FB_BLANK_NORMAL) | ||
2813 | aty_bl_set_power(info, FB_BLANK_POWERDOWN); | ||
2814 | #elif defined(CONFIG_FB_ATY_GENERIC_LCD) | 2800 | #elif defined(CONFIG_FB_ATY_GENERIC_LCD) |
2815 | if (par->lcd_table && blank > FB_BLANK_NORMAL && | 2801 | if (par->lcd_table && blank > FB_BLANK_NORMAL && |
2816 | (aty_ld_lcd(LCD_GEN_CNTL, par) & LCD_ON)) { | 2802 | (aty_ld_lcd(LCD_GEN_CNTL, par) & LCD_ON)) { |
@@ -2841,8 +2827,6 @@ static int atyfb_blank(int blank, struct fb_info *info) | |||
2841 | aty_st_le32(CRTC_GEN_CNTL, gen_cntl, par); | 2827 | aty_st_le32(CRTC_GEN_CNTL, gen_cntl, par); |
2842 | 2828 | ||
2843 | #ifdef CONFIG_FB_ATY_BACKLIGHT | 2829 | #ifdef CONFIG_FB_ATY_BACKLIGHT |
2844 | if (machine_is(powermac) && blank <= FB_BLANK_NORMAL) | ||
2845 | aty_bl_set_power(info, FB_BLANK_UNBLANK); | ||
2846 | #elif defined(CONFIG_FB_ATY_GENERIC_LCD) | 2830 | #elif defined(CONFIG_FB_ATY_GENERIC_LCD) |
2847 | if (par->lcd_table && blank <= FB_BLANK_NORMAL && | 2831 | if (par->lcd_table && blank <= FB_BLANK_NORMAL && |
2848 | (aty_ld_lcd(LCD_GEN_CNTL, par) & LCD_ON)) { | 2832 | (aty_ld_lcd(LCD_GEN_CNTL, par) & LCD_ON)) { |