patch-2.1.124 linux/drivers/video/macmodes.c

• Lines: 27
• Date: Wed Sep 30 10:19:11 1998
• Orig file: v2.1.123/linux/drivers/video/macmodes.c
• Orig date: Mon Aug 3 12:45:46 1998

diff -u --recursive --new-file v2.1.123/linux/drivers/video/macmodes.c linux/drivers/video/macmodes.c
@@ -12,7 +12,7 @@
 #include <linux/fb.h>
 #include <linux/string.h>
 
-#include "macmodes.h"
+#include <video/macmodes.h>
 
 struct mac_mode {
     int number;
@@ -348,7 +348,7 @@
 int mac_var_to_vmode(const struct fb_var_screeninfo *var, int *vmode,
 		     int *cmode)
 {
-    int i = 0;
+    unsigned int i;
 
     if (var->bits_per_pixel <= 8)
 	*cmode = CMODE_8;
@@ -367,7 +367,7 @@
 	    continue;
 	if (var->pixclock > mode->pixclock)
 	    continue;
-	if (var->vmode != mode->vmode)
+	if ((var->vmode & FB_VMODE_MASK) != mode->vmode)
 	    continue;
 	*vmode = mode->number;
 	return 0;