projects
/
powerpc.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Pull Kconfig into release branch
[powerpc.git]
/
drivers
/
video
/
aty
/
atyfb_base.c
diff --git
a/drivers/video/aty/atyfb_base.c
b/drivers/video/aty/atyfb_base.c
index
e799fcc
..
d9d7d3c
100644
(file)
--- a/
drivers/video/aty/atyfb_base.c
+++ b/
drivers/video/aty/atyfb_base.c
@@
-75,6
+75,7
@@
#include "ati_ids.h"
#ifdef __powerpc__
#include "ati_ids.h"
#ifdef __powerpc__
+#include <asm/machdep.h>
#include <asm/prom.h>
#include "../macmodes.h"
#endif
#include <asm/prom.h>
#include "../macmodes.h"
#endif
@@
-2518,7
+2519,7
@@
static int __init aty_init(struct fb_info *info, const char *name)
memset(&var, 0, sizeof(var));
#ifdef CONFIG_PPC
memset(&var, 0, sizeof(var));
#ifdef CONFIG_PPC
- if (
_machine == _MACH_Pmac
) {
+ if (
machine_is(powermac)
) {
/*
* FIXME: The NVRAM stuff should be put in a Mac-specific file, as it
* applies to all Mac video cards
/*
* FIXME: The NVRAM stuff should be put in a Mac-specific file, as it
* applies to all Mac video cards
@@
-2673,7
+2674,7
@@
static int atyfb_blank(int blank, struct fb_info *info)
return 0;
#ifdef CONFIG_PMAC_BACKLIGHT
return 0;
#ifdef CONFIG_PMAC_BACKLIGHT
- if (
(_machine == _MACH_P
mac) && blank > FB_BLANK_NORMAL)
+ if (
machine_is(power
mac) && blank > FB_BLANK_NORMAL)
set_backlight_enable(0);
#elif defined(CONFIG_FB_ATY_GENERIC_LCD)
if (par->lcd_table && blank > FB_BLANK_NORMAL &&
set_backlight_enable(0);
#elif defined(CONFIG_FB_ATY_GENERIC_LCD)
if (par->lcd_table && blank > FB_BLANK_NORMAL &&
@@
-2705,7
+2706,7
@@
static int atyfb_blank(int blank, struct fb_info *info)
aty_st_le32(CRTC_GEN_CNTL, gen_cntl, par);
#ifdef CONFIG_PMAC_BACKLIGHT
aty_st_le32(CRTC_GEN_CNTL, gen_cntl, par);
#ifdef CONFIG_PMAC_BACKLIGHT
- if (
(_machine == _MACH_P
mac) && blank <= FB_BLANK_NORMAL)
+ if (
machine_is(power
mac) && blank <= FB_BLANK_NORMAL)
set_backlight_enable(1);
#elif defined(CONFIG_FB_ATY_GENERIC_LCD)
if (par->lcd_table && blank <= FB_BLANK_NORMAL &&
set_backlight_enable(1);
#elif defined(CONFIG_FB_ATY_GENERIC_LCD)
if (par->lcd_table && blank <= FB_BLANK_NORMAL &&
@@
-3399,7
+3400,7
@@
static int __devinit atyfb_pci_probe(struct pci_dev *pdev, const struct pci_devi
struct atyfb_par *par;
int i, rc = -ENOMEM;
struct atyfb_par *par;
int i, rc = -ENOMEM;
- for (i = ARRAY_SIZE(aty_chips); i >= 0; i--)
+ for (i = ARRAY_SIZE(aty_chips)
- 1
; i >= 0; i--)
if (pdev->device == aty_chips[i].pci_id)
break;
if (pdev->device == aty_chips[i].pci_id)
break;