Merge master.kernel.org:/pub/scm/linux/kernel/git/gregkh/pci-2.6

[linux-2.6-omap-h63xx.git] / drivers / video / matrox / matroxfb_DAC1064.c

diff --git a/drivers/video/matrox/matroxfb_DAC1064.c b/drivers/video/matrox/matroxfb_DAC1064.c
index 94ba81543cd2b5112eb4d036e7537f401ed88566..a456e67a5b004270048a7a38a351bee3d410c9f8 100644 (file)
--- a/drivers/video/matrox/matroxfb_DAC1064.c
+++ b/drivers/video/matrox/matroxfb_DAC1064.c
@@ -12,7 +12,6 @@
  *
  */
 
-/* make checkconfig does not walk through include tree :-( */
 #include <linux/config.h>
 
 #include "matroxfb_DAC1064.h"
@@ -978,7 +977,7 @@ static void MGAG100_reset(WPMINFO2) {
                                hw->MXoptionReg |= 0x40;        /* FIXME... */
                                pci_write_config_dword(ACCESS_FBINFO(pcidev), PCI_OPTION_REG, hw->MXoptionReg);
                        }
-                       mga_setr(M_EXTVGA_INDEX, 0x06, 0x50);
+                       mga_setr(M_EXTVGA_INDEX, 0x06, 0x00);
                }
        }
        if (ACCESS_FBINFO(devflags.g450dac)) {