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