diff options
Diffstat (limited to 'drivers/video/aty/aty128fb.c')
-rw-r--r-- | drivers/video/aty/aty128fb.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/drivers/video/aty/aty128fb.c b/drivers/video/aty/aty128fb.c index 620c9a934e0e..f07be22e119d 100644 --- a/drivers/video/aty/aty128fb.c +++ b/drivers/video/aty/aty128fb.c | |||
@@ -67,6 +67,7 @@ | |||
67 | #include <asm/io.h> | 67 | #include <asm/io.h> |
68 | 68 | ||
69 | #ifdef CONFIG_PPC_PMAC | 69 | #ifdef CONFIG_PPC_PMAC |
70 | #include <asm/machdep.h> | ||
70 | #include <asm/pmac_feature.h> | 71 | #include <asm/pmac_feature.h> |
71 | #include <asm/prom.h> | 72 | #include <asm/prom.h> |
72 | #include <asm/pci-bridge.h> | 73 | #include <asm/pci-bridge.h> |
@@ -1748,7 +1749,7 @@ static int __init aty128_init(struct pci_dev *pdev, const struct pci_device_id * | |||
1748 | 1749 | ||
1749 | var = default_var; | 1750 | var = default_var; |
1750 | #ifdef CONFIG_PPC_PMAC | 1751 | #ifdef CONFIG_PPC_PMAC |
1751 | if (_machine == _MACH_Pmac) { | 1752 | if (machine_is(powermac)) { |
1752 | /* Indicate sleep capability */ | 1753 | /* Indicate sleep capability */ |
1753 | if (par->chip_gen == rage_M3) { | 1754 | if (par->chip_gen == rage_M3) { |
1754 | pmac_call_feature(PMAC_FTR_DEVICE_CAN_WAKE, NULL, 0, 1); | 1755 | pmac_call_feature(PMAC_FTR_DEVICE_CAN_WAKE, NULL, 0, 1); |
@@ -2011,7 +2012,7 @@ static int aty128fb_blank(int blank, struct fb_info *fb) | |||
2011 | return 0; | 2012 | return 0; |
2012 | 2013 | ||
2013 | #ifdef CONFIG_PMAC_BACKLIGHT | 2014 | #ifdef CONFIG_PMAC_BACKLIGHT |
2014 | if ((_machine == _MACH_Pmac) && blank) | 2015 | if (machine_is(powermac) && blank) |
2015 | set_backlight_enable(0); | 2016 | set_backlight_enable(0); |
2016 | #endif /* CONFIG_PMAC_BACKLIGHT */ | 2017 | #endif /* CONFIG_PMAC_BACKLIGHT */ |
2017 | 2018 | ||
@@ -2029,7 +2030,7 @@ static int aty128fb_blank(int blank, struct fb_info *fb) | |||
2029 | aty128_set_lcd_enable(par, par->lcd_on && !blank); | 2030 | aty128_set_lcd_enable(par, par->lcd_on && !blank); |
2030 | } | 2031 | } |
2031 | #ifdef CONFIG_PMAC_BACKLIGHT | 2032 | #ifdef CONFIG_PMAC_BACKLIGHT |
2032 | if ((_machine == _MACH_Pmac) && !blank) | 2033 | if (machine_is(powermac) && !blank) |
2033 | set_backlight_enable(1); | 2034 | set_backlight_enable(1); |
2034 | #endif /* CONFIG_PMAC_BACKLIGHT */ | 2035 | #endif /* CONFIG_PMAC_BACKLIGHT */ |
2035 | return 0; | 2036 | return 0; |