diff options
| author | Anton Altaparmakov <aia21@cantab.net> | 2006-01-19 19:39:33 +0300 |
|---|---|---|
| committer | Anton Altaparmakov <aia21@cantab.net> | 2006-01-19 19:39:33 +0300 |
| commit | 944d79559d154c12becde0dab327016cf438f46c (patch) | |
| tree | 50c101806f4d3b6585222dda060559eb4f3e005a /drivers/video/matrox/matroxfb_misc.c | |
| parent | d087e4bdd24ebe3ae3d0b265b6573ec901af4b4b (diff) | |
| parent | 0f36b018b2e314d45af86449f1a97facb1fbe300 (diff) | |
| download | linux-944d79559d154c12becde0dab327016cf438f46c.tar.xz | |
Merge branch 'master' of /usr/src/ntfs-2.6/
Diffstat (limited to 'drivers/video/matrox/matroxfb_misc.c')
| -rw-r--r-- | drivers/video/matrox/matroxfb_misc.c | 8 |
1 files changed, 1 insertions, 7 deletions
diff --git a/drivers/video/matrox/matroxfb_misc.c b/drivers/video/matrox/matroxfb_misc.c index d9d3e9f6c08e..455a46ce840c 100644 --- a/drivers/video/matrox/matroxfb_misc.c +++ b/drivers/video/matrox/matroxfb_misc.c @@ -192,11 +192,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 +232,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; |