diff options
Diffstat (limited to 'drivers/video/matrox/matroxfb_base.c')
-rw-r--r-- | drivers/video/matrox/matroxfb_base.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/video/matrox/matroxfb_base.c b/drivers/video/matrox/matroxfb_base.c index 951c9974a1d3..23c1827b2d0b 100644 --- a/drivers/video/matrox/matroxfb_base.c +++ b/drivers/video/matrox/matroxfb_base.c | |||
@@ -115,6 +115,7 @@ | |||
115 | #include <asm/uaccess.h> | 115 | #include <asm/uaccess.h> |
116 | 116 | ||
117 | #ifdef CONFIG_PPC_PMAC | 117 | #ifdef CONFIG_PPC_PMAC |
118 | #include <asm/machdep.h> | ||
118 | unsigned char nvram_read_byte(int); | 119 | unsigned char nvram_read_byte(int); |
119 | static int default_vmode = VMODE_NVRAM; | 120 | static int default_vmode = VMODE_NVRAM; |
120 | static int default_cmode = CMODE_NVRAM; | 121 | static int default_cmode = CMODE_NVRAM; |
@@ -1833,7 +1834,7 @@ static int initMatrox2(WPMINFO struct board* b){ | |||
1833 | /* FIXME: Where to move this?! */ | 1834 | /* FIXME: Where to move this?! */ |
1834 | #if defined(CONFIG_PPC_PMAC) | 1835 | #if defined(CONFIG_PPC_PMAC) |
1835 | #ifndef MODULE | 1836 | #ifndef MODULE |
1836 | if (_machine == _MACH_Pmac) { | 1837 | if (machine_is(powermac)) { |
1837 | struct fb_var_screeninfo var; | 1838 | struct fb_var_screeninfo var; |
1838 | if (default_vmode <= 0 || default_vmode > VMODE_MAX) | 1839 | if (default_vmode <= 0 || default_vmode > VMODE_MAX) |
1839 | default_vmode = VMODE_640_480_60; | 1840 | default_vmode = VMODE_640_480_60; |