projects
/
powerpc.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
vt8623fb: new framebuffer driver for VIA VT8623
[powerpc.git]
/
drivers
/
video
/
matrox
/
matroxfb_misc.c
diff --git
a/drivers/video/matrox/matroxfb_misc.c
b/drivers/video/matrox/matroxfb_misc.c
index
d9d3e9f
..
18886b6
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>
#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;
unsigned int wd;
unsigned int divider;
int i;
- int fwidth;
struct matrox_hw_state * const hw = &ACCESS_FBINFO(hw);
struct matrox_hw_state * const hw = &ACCESS_FBINFO(hw);
- fwidth = 8;
-
DBG(__FUNCTION__)
hw->SEQ[0] = 0x00;
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;
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;
hw->ATTR[20] = 0x00;
hd = m->HDisplay >> 3;