diff options
Diffstat (limited to 'drivers/video/aty/atyfb_base.c')
-rw-r--r-- | drivers/video/aty/atyfb_base.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/drivers/video/aty/atyfb_base.c b/drivers/video/aty/atyfb_base.c index 485be386a8ff..1b1f24e2bfbe 100644 --- a/drivers/video/aty/atyfb_base.c +++ b/drivers/video/aty/atyfb_base.c | |||
@@ -75,6 +75,7 @@ | |||
75 | #include "ati_ids.h" | 75 | #include "ati_ids.h" |
76 | 76 | ||
77 | #ifdef __powerpc__ | 77 | #ifdef __powerpc__ |
78 | #include <asm/machdep.h> | ||
78 | #include <asm/prom.h> | 79 | #include <asm/prom.h> |
79 | #include "../macmodes.h" | 80 | #include "../macmodes.h" |
80 | #endif | 81 | #endif |
@@ -2516,7 +2517,7 @@ static int __init aty_init(struct fb_info *info, const char *name) | |||
2516 | 2517 | ||
2517 | memset(&var, 0, sizeof(var)); | 2518 | memset(&var, 0, sizeof(var)); |
2518 | #ifdef CONFIG_PPC | 2519 | #ifdef CONFIG_PPC |
2519 | if (_machine == _MACH_Pmac) { | 2520 | if (machine_is(powermac)) { |
2520 | /* | 2521 | /* |
2521 | * FIXME: The NVRAM stuff should be put in a Mac-specific file, as it | 2522 | * FIXME: The NVRAM stuff should be put in a Mac-specific file, as it |
2522 | * applies to all Mac video cards | 2523 | * applies to all Mac video cards |
@@ -2671,7 +2672,7 @@ static int atyfb_blank(int blank, struct fb_info *info) | |||
2671 | return 0; | 2672 | return 0; |
2672 | 2673 | ||
2673 | #ifdef CONFIG_PMAC_BACKLIGHT | 2674 | #ifdef CONFIG_PMAC_BACKLIGHT |
2674 | if ((_machine == _MACH_Pmac) && blank > FB_BLANK_NORMAL) | 2675 | if (machine_is(powermac) && blank > FB_BLANK_NORMAL) |
2675 | set_backlight_enable(0); | 2676 | set_backlight_enable(0); |
2676 | #elif defined(CONFIG_FB_ATY_GENERIC_LCD) | 2677 | #elif defined(CONFIG_FB_ATY_GENERIC_LCD) |
2677 | if (par->lcd_table && blank > FB_BLANK_NORMAL && | 2678 | if (par->lcd_table && blank > FB_BLANK_NORMAL && |
@@ -2703,7 +2704,7 @@ static int atyfb_blank(int blank, struct fb_info *info) | |||
2703 | aty_st_le32(CRTC_GEN_CNTL, gen_cntl, par); | 2704 | aty_st_le32(CRTC_GEN_CNTL, gen_cntl, par); |
2704 | 2705 | ||
2705 | #ifdef CONFIG_PMAC_BACKLIGHT | 2706 | #ifdef CONFIG_PMAC_BACKLIGHT |
2706 | if ((_machine == _MACH_Pmac) && blank <= FB_BLANK_NORMAL) | 2707 | if (machine_is(powermac) && blank <= FB_BLANK_NORMAL) |
2707 | set_backlight_enable(1); | 2708 | set_backlight_enable(1); |
2708 | #elif defined(CONFIG_FB_ATY_GENERIC_LCD) | 2709 | #elif defined(CONFIG_FB_ATY_GENERIC_LCD) |
2709 | if (par->lcd_table && blank <= FB_BLANK_NORMAL && | 2710 | if (par->lcd_table && blank <= FB_BLANK_NORMAL && |