linux 2.6.16.38 w/ vs2.0.3-rc1

[linux-2.6.git] / drivers / video / matrox / matroxfb_base.c

diff --git a/drivers/video/matrox/matroxfb_base.c b/drivers/video/matrox/matroxfb_base.c
index 23c1827..4055ff6 100644 (file)
--- a/drivers/video/matrox/matroxfb_base.c
+++ b/drivers/video/matrox/matroxfb_base.c
@@ -99,6 +99,7 @@
  *
  */
 
+/* make checkconfig does not check included files... */
 #include <linux/config.h>
 #include <linux/version.h>
 
@@ -115,7 +116,6 @@
 #include <asm/uaccess.h>
 
 #ifdef CONFIG_PPC_PMAC
-#include <asm/machdep.h>
 unsigned char nvram_read_byte(int);
 static int default_vmode = VMODE_NVRAM;
 static int default_cmode = CMODE_NVRAM;
@@ -1834,7 +1834,7 @@ static int initMatrox2(WPMINFO struct board* b){
        /* FIXME: Where to move this?! */
 #if defined(CONFIG_PPC_PMAC)
 #ifndef MODULE
-       if (machine_is(powermac)) {
+       if (_machine == _MACH_Pmac) {
                struct fb_var_screeninfo var;
                if (default_vmode <= 0 || default_vmode > VMODE_MAX)
                        default_vmode = VMODE_640_480_60;