--- sys/dev/fb/vesa.c	2010-01-21 14:04:22.000000000 -0500
+++ sys/dev/fb/vesa.c	2010-01-25 17:37:34.000000000 -0500
@@ -1367,8 +1367,10 @@
 {
 	int bits;
 
-	if ((adp == vesa_adp) &&
+	if ((adp == vesa_adp) && VESA_MODE(adp->va_mode) &&
+#if 0
 	    (adp->va_info.vi_flags & V_INFO_NONVGA) != 0 &&
+#endif
 	    (bits = vesa_bios_get_dac()) >= 6)
 		return (vesa_bios_save_palette(0, 256, palette, bits));
 
@@ -1380,8 +1382,10 @@
 {
 	int bits;
 
-	if ((adp == vesa_adp) &&
+	if ((adp == vesa_adp) && VESA_MODE(adp->va_mode) &&
+#if 0
 	    (adp->va_info.vi_flags & V_INFO_NONVGA) != 0 &&
+#endif
 	    (bits = vesa_bios_get_dac()) >= 6)
 		return (vesa_bios_load_palette(0, 256, palette, bits));
 
@@ -1585,7 +1589,10 @@
 		return (1);
 	if ((base + count) > 256)
 		return (1);
-	if ((adp->va_info.vi_flags & V_INFO_NONVGA) == 0 ||
+	if (!VESA_MODE(adp->va_mode) ||
+#if 0
+	    (adp->va_info.vi_flags & V_INFO_NONVGA) == 0 ||
+#endif
 	    (bits = vesa_bios_get_dac()) < 6)
 		return (1);
 
@@ -1619,7 +1626,10 @@
 
 	if ((base < 0) || (base >= 256) || (base + count > 256))
 		return (1);
-	if ((adp->va_info.vi_flags & V_INFO_NONVGA) == 0 ||
+	if (!VESA_MODE(adp->va_mode) ||
+#if 0
+	    (adp->va_info.vi_flags & V_INFO_NONVGA) == 0 ||
+#endif
 	    (bits = vesa_bios_get_dac()) < 6)
 		return (1);