Merge master.kernel.org:/pub/scm/linux/kernel/git/kyle/parisc-2.6

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

diff --git a/drivers/video/matrox/matroxfb_misc.c b/drivers/video/matrox/matroxfb_misc.c
index d9d3e9f6c08e245d54c8cf0621b340e03708fcc3..18886b629cb1bb3c8fcea5cb9a0f4132f0fdb20c 100644 (file)
--- a/drivers/video/matrox/matroxfb_misc.c
+++ b/drivers/video/matrox/matroxfb_misc.c
@@ -84,8 +84,6 @@
  *
  */
 
-/* make checkconfig does not check includes for this... */
-#include <linux/config.h>
 
 #include "matroxfb_misc.h"
 #include <linux/interrupt.h>
@@ -192,11 +190,8 @@ int matroxfb_vgaHWinit(WPMINFO struct my_timming* m) {
        unsigned int wd;
        unsigned int divider;
        int i;
-       int fwidth;
        struct matrox_hw_state * const hw = &ACCESS_FBINFO(hw);
 
-       fwidth = 8;
-
        DBG(__FUNCTION__)
 
        hw->SEQ[0] = 0x00;
@@ -235,10 +230,7 @@ int matroxfb_vgaHWinit(WPMINFO struct my_timming* m) {
        hw->ATTR[16] = 0x41;
        hw->ATTR[17] = 0xFF;
        hw->ATTR[18] = 0x0F;
-       if (fwidth == 9)
-               hw->ATTR[19] = 0x08;
-       else
-               hw->ATTR[19] = 0x00;
+       hw->ATTR[19] = 0x00;
        hw->ATTR[20] = 0x00;
 
        hd = m->HDisplay >> 3;